From 632b72a98e8c6abb8b2740894d2ba78bb9662821 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Fri, 3 Mar 2017 11:23:56 -0800 Subject: [PATCH 1/8] Testing --- Jenkinsfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..fe5273e --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,18 @@ +@Library("yooture@test") +import org.foo.Zot + +pipeline { + agent any + stages { + stage('Example') { + steps { + echo 'Hello World' + } + } + } + post { + always { + echo 'I will always say Hello again!' + } + } +} From 19aad38cae2dcfdb1e1e156d42c5017cf49541a8 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 28 Mar 2017 16:44:12 -0700 Subject: [PATCH 2/8] Update Jenkinsfile --- Jenkinsfile | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe5273e..a93bc6e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,18 +1,23 @@ -@Library("yooture@test") -import org.foo.Zot - pipeline { - agent any + environment { + MICROSERVICE_NAME = "directory" + IMAGE_NAME = "quay.io/svc/${env.MICROSERVICE_NAME}" + + IMAGE_ID = "${env.IMAGE_NAME}:${env.TAG_NAME}" + TAG_NAME = "${(env.BRANCH_NAME + "_" + env.BUILD_ID).replaceAll("[.:/\\\\#]", '-')}" + } + agent { + label "some-label" + } + stages { - stage('Example') { + stage("foo") { steps { - echo 'Hello World' + sh 'echo "MICROSERVICE_NAME is ${env.MICROSERVICE_NAME}"' + sh 'echo "IMAGE_NAME is ${env.IMAGE_NAME}"' + sh 'echo "IMAGE_ID is ${env.IMAGE_ID}"' + sh 'echo "TAG_NAME is ${env.TAG_NAME}"' } } } - post { - always { - echo 'I will always say Hello again!' - } - } } From e216690596118b1362afe40f51e457218c68496a Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 28 Mar 2017 16:45:36 -0700 Subject: [PATCH 3/8] Update Jenkinsfile --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a93bc6e..f3f7198 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,10 +13,10 @@ pipeline { stages { stage("foo") { steps { - sh 'echo "MICROSERVICE_NAME is ${env.MICROSERVICE_NAME}"' - sh 'echo "IMAGE_NAME is ${env.IMAGE_NAME}"' - sh 'echo "IMAGE_ID is ${env.IMAGE_ID}"' - sh 'echo "TAG_NAME is ${env.TAG_NAME}"' + echo "MICROSERVICE_NAME is ${env.MICROSERVICE_NAME}" + echo "IMAGE_NAME is ${env.IMAGE_NAME}" + echo "IMAGE_ID is ${env.IMAGE_ID}" + echo "TAG_NAME is ${env.TAG_NAME}" } } } From af15f09a2bd751a27ebf7e61c766df3790698a4a Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 28 Mar 2017 16:46:15 -0700 Subject: [PATCH 4/8] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f3f7198..1c5867e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,10 @@ pipeline { environment { MICROSERVICE_NAME = "directory" - IMAGE_NAME = "quay.io/svc/${env.MICROSERVICE_NAME}" + IMAGE_NAME = "quay.io/svc/${MICROSERVICE_NAME}" - IMAGE_ID = "${env.IMAGE_NAME}:${env.TAG_NAME}" - TAG_NAME = "${(env.BRANCH_NAME + "_" + env.BUILD_ID).replaceAll("[.:/\\\\#]", '-')}" + IMAGE_ID = "${IMAGE_NAME}:${TAG_NAME}" + TAG_NAME = "${BRANCH_NAME + "_" + BUILD_ID).replaceAll("[.:/\\\\#]", '-'}" } agent { label "some-label" From 59a8e00c3f0990bbaa3c0255a91db337059c1ed6 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 28 Mar 2017 16:47:06 -0700 Subject: [PATCH 5/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1c5867e..feb85bc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { IMAGE_NAME = "quay.io/svc/${MICROSERVICE_NAME}" IMAGE_ID = "${IMAGE_NAME}:${TAG_NAME}" - TAG_NAME = "${BRANCH_NAME + "_" + BUILD_ID).replaceAll("[.:/\\\\#]", '-'}" + TAG_NAME = "${BRANCH_NAME + "_" + BUILD_ID}" //.replaceAll("[.:/\\\\#]", '-')}" } agent { label "some-label" From f8e3c81f86b5d4910269e46426cf7da04934498e Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 28 Mar 2017 16:47:46 -0700 Subject: [PATCH 6/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index feb85bc..0f3718e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { IMAGE_NAME = "quay.io/svc/${MICROSERVICE_NAME}" IMAGE_ID = "${IMAGE_NAME}:${TAG_NAME}" - TAG_NAME = "${BRANCH_NAME + "_" + BUILD_ID}" //.replaceAll("[.:/\\\\#]", '-')}" + TAG_NAME = "${(BRANCH_NAME + "_" + BUILD_ID).replaceAll("[.:/\\\\#]", '-')}" } agent { label "some-label" From 7a10a5fe21a03a4ea2fb2daa40fe71fb0f378351 Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 9 May 2017 10:50:11 -0400 Subject: [PATCH 7/8] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 0f3718e..f0a5c57 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,6 +13,7 @@ pipeline { stages { stage("foo") { steps { + checkout scm echo "MICROSERVICE_NAME is ${env.MICROSERVICE_NAME}" echo "IMAGE_NAME is ${env.IMAGE_NAME}" echo "IMAGE_ID is ${env.IMAGE_ID}" From 3eed8b0860f42ed9be678129c17acd9c1672ee7f Mon Sep 17 00:00:00 2001 From: Andrew Bayer Date: Tue, 9 May 2017 10:51:54 -0400 Subject: [PATCH 8/8] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f0a5c57..25e5117 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { TAG_NAME = "${(BRANCH_NAME + "_" + BUILD_ID).replaceAll("[.:/\\\\#]", '-')}" } agent { - label "some-label" + label "master" } stages {