diff --git a/jobs/build/k_ocp4/Jenkinsfile b/jobs/build/k_ocp4/Jenkinsfile index 6fbe87e4cc..2d0f450564 100644 --- a/jobs/build/k_ocp4/Jenkinsfile +++ b/jobs/build/k_ocp4/Jenkinsfile @@ -131,8 +131,6 @@ node { aws(credentialsId: 's3-art-srv-enterprise', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'), string(credentialsId: 'art-bot-slack-token', variable: 'SLACK_BOT_TOKEN'), usernamePassword(credentialsId: 'art-dash-db-login', passwordVariable: 'DOOZER_DB_PASSWORD', usernameVariable: 'DOOZER_DB_USER'), - file(credentialsId: 'art-jenkins-ldap-serviceaccount-private-key', variable: 'RHSM_PULP_KEY'), - file(credentialsId: 'art-jenkins-ldap-serviceaccount-client-cert', variable: 'RHSM_PULP_CERT'), ]) { withEnv(["BUILD_USER_EMAIL=${builderEmail?: ''}", "BUILD_URL=${BUILD_URL}", "JOB_NAME=${JOB_NAME}", 'DOOZER_DB_NAME=art_dash']) { sh "rm -rf ./artcd_working && mkdir -p ./artcd_working" diff --git a/jobs/build/ocp4/Jenkinsfile b/jobs/build/ocp4/Jenkinsfile index fbd696861c..760209bffb 100644 --- a/jobs/build/ocp4/Jenkinsfile +++ b/jobs/build/ocp4/Jenkinsfile @@ -221,8 +221,6 @@ node { aws(credentialsId: 's3-art-srv-enterprise', accessKeyVariable: 'AWS_ACCESS_KEY_ID', secretKeyVariable: 'AWS_SECRET_ACCESS_KEY'), string(credentialsId: 'art-bot-slack-token', variable: 'SLACK_BOT_TOKEN'), usernamePassword(credentialsId: 'art-dash-db-login', passwordVariable: 'DOOZER_DB_PASSWORD', usernameVariable: 'DOOZER_DB_USER'), - file(credentialsId: 'art-jenkins-ldap-serviceaccount-private-key', variable: 'RHSM_PULP_KEY'), - file(credentialsId: 'art-jenkins-ldap-serviceaccount-client-cert', variable: 'RHSM_PULP_CERT'), file(credentialsId: "art-cluster-art-cd-pipeline-kubeconfig", variable: 'ART_CLUSTER_ART_CD_PIPELINE_KUBECONFIG'), ]) { withEnv(["BUILD_USER_EMAIL=${builderEmail?: ''}", "BUILD_URL=${BUILD_URL}", "JOB_NAME=${JOB_NAME}", 'DOOZER_DB_NAME=art_dash']) { diff --git a/jobs/build/rebuild/Jenkinsfile b/jobs/build/rebuild/Jenkinsfile index 15c07d7b7f..5e082b3651 100644 --- a/jobs/build/rebuild/Jenkinsfile +++ b/jobs/build/rebuild/Jenkinsfile @@ -116,8 +116,6 @@ node { string(credentialsId: 'redis-host', variable: 'REDIS_HOST'), string(credentialsId: 'redis-port', variable: 'REDIS_PORT'), usernamePassword(credentialsId: 'art-dash-db-login', passwordVariable: 'DOOZER_DB_PASSWORD', usernameVariable: 'DOOZER_DB_USER'), - file(credentialsId: 'art-jenkins-ldap-serviceaccount-private-key', variable: 'RHSM_PULP_KEY'), - file(credentialsId: 'art-jenkins-ldap-serviceaccount-client-cert', variable: 'RHSM_PULP_CERT'), ]) { echo "Will run ${cmd}" wrap([$class: 'BuildUser']) { diff --git a/pipeline-scripts/buildlib.groovy b/pipeline-scripts/buildlib.groovy index d0d2ad2c15..049c08aeaf 100644 --- a/pipeline-scripts/buildlib.groovy +++ b/pipeline-scripts/buildlib.groovy @@ -176,12 +176,6 @@ def doozer(cmd, opts=[:]){ usernamePassword( credentialsId: 'art-dash-db-login', passwordVariable: 'DOOZER_DB_PASSWORD', usernameVariable: 'DOOZER_DB_USER'), - file( - credentialsId: 'art-jenkins-ldap-serviceaccount-private-key', - variable: 'RHSM_PULP_KEY'), - file( - credentialsId: 'art-jenkins-ldap-serviceaccount-client-cert', - variable: 'RHSM_PULP_CERT'), ]) { withEnv(['DOOZER_DB_NAME=art_dash']) { return commonlib.shell(