From 145d3decbe63a96832bde0883972cc41a5ddedae Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Sat, 4 Jan 2020 17:12:30 -0500 Subject: [PATCH 1/4] Update Jenkinsfile --- Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 769ddfe6b..22ad611ac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,11 +37,13 @@ try { } } } + } + node("skopeo") { stage("Tag DEV") { echo "Tag image to DEV" openshift.withCluster() { - openshift.withProject('cicd') { - openshift.tag("${appName}:latest", "${appName}:dev") + withCredentials([usernamePassword(credentialsId: "quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { + sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:latest docker://quay.io/${QUAY_USERNAME}/${appName}:dev --src-creds \"$QUAY_USER:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USER:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" } } } @@ -59,8 +61,8 @@ try { stage("Tag for QA") { echo "Tag to UAT" openshift.withCluster() { - openshift.withProject('cicd') { - openshift.tag("${appName}:dev", "${appName}:uat") + withCredentials([usernamePassword(credentialsId: "quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { + sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:dev docker://quay.io/${QUAY_USERNAME}/${appName}:uat --src-creds \"$QUAY_USER:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USER:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" } } } From 16b9370ed35648818aac22578e058c075fe168e2 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Sat, 4 Jan 2020 17:37:13 -0500 Subject: [PATCH 2/4] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 22ad611ac..6012bc061 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -38,7 +38,7 @@ try { } } } - node("skopeo") { + node("jenkins-slave-skopeo") { stage("Tag DEV") { echo "Tag image to DEV" openshift.withCluster() { From 06f5ab6d81183236b6dd94dac4589acad6d012bb Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Sat, 4 Jan 2020 17:42:51 -0500 Subject: [PATCH 3/4] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6012bc061..57bb2d091 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,7 +42,7 @@ try { stage("Tag DEV") { echo "Tag image to DEV" openshift.withCluster() { - withCredentials([usernamePassword(credentialsId: "quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { + withCredentials([usernamePassword(credentialsId: "cicd-quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:latest docker://quay.io/${QUAY_USERNAME}/${appName}:dev --src-creds \"$QUAY_USER:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USER:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" } } @@ -61,7 +61,7 @@ try { stage("Tag for QA") { echo "Tag to UAT" openshift.withCluster() { - withCredentials([usernamePassword(credentialsId: "quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { + withCredentials([usernamePassword(credentialsId: "cicd-quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:dev docker://quay.io/${QUAY_USERNAME}/${appName}:uat --src-creds \"$QUAY_USER:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USER:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" } } From aa45e696a31d4d25094a28564942e9392e6a2683 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Sat, 4 Jan 2020 18:28:35 -0500 Subject: [PATCH 4/4] Update Jenkinsfile --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57bb2d091..b058392ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,8 +42,8 @@ try { stage("Tag DEV") { echo "Tag image to DEV" openshift.withCluster() { - withCredentials([usernamePassword(credentialsId: "cicd-quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { - sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:latest docker://quay.io/${QUAY_USERNAME}/${appName}:dev --src-creds \"$QUAY_USER:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USER:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" + withCredentials([usernamePassword(credentialsId: "cicd-quay-creds-secret", usernameVariable: "QUAY_USERNAME", passwordVariable: "QUAY_PASSWORD")]) { + sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:latest docker://quay.io/${QUAY_USERNAME}/${appName}:dev --src-creds \"$QUAY_USERNAME:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USERNAME:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" } } } @@ -61,8 +61,8 @@ try { stage("Tag for QA") { echo "Tag to UAT" openshift.withCluster() { - withCredentials([usernamePassword(credentialsId: "cicd-quay-creds-secret", usernameVariable: "QUAY_USER", passwordVariable: "QUAY_PASSWORD")]) { - sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:dev docker://quay.io/${QUAY_USERNAME}/${appName}:uat --src-creds \"$QUAY_USER:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USER:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" + withCredentials([usernamePassword(credentialsId: "cicd-quay-creds-secret", usernameVariable: "QUAY_USERNAME", passwordVariable: "QUAY_PASSWORD")]) { + sh "skopeo copy docker://quay.io/${QUAY_USERNAME}/${appName}:dev docker://quay.io/${QUAY_USERNAME}/${appName}:uat --src-creds \"$QUAY_USERNAME:$QUAY_PASSWORD\" --dest-creds \"$QUAY_USERNAME:$QUAY_PASSWORD\" --src-tls-verify=false --dest-tls-verify=false" } } }