From 1dc959dd7bfd051d7169c32604cc87a4e3f4ea07 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Tue, 13 Aug 2019 15:00:57 -0400 Subject: [PATCH 01/23] hello world pr test --- csmtest/helloworld.sh | 1 + 1 file changed, 1 insertion(+) create mode 100644 csmtest/helloworld.sh diff --git a/csmtest/helloworld.sh b/csmtest/helloworld.sh new file mode 100644 index 000000000..026ec8d30 --- /dev/null +++ b/csmtest/helloworld.sh @@ -0,0 +1 @@ +#Hello World! From 3c79a8179cef6c2df04ba08ea39063e50e6f8bd4 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Tue, 13 Aug 2019 15:57:55 -0400 Subject: [PATCH 02/23] jenkins test 2 pr update rerun regression --- csmtest/helloworld.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/csmtest/helloworld.sh b/csmtest/helloworld.sh index 026ec8d30..518183a96 100644 --- a/csmtest/helloworld.sh +++ b/csmtest/helloworld.sh @@ -1 +1,2 @@ #Hello World! +#Hello World! From c78f524ed86de2ff85996bc01bd80731c69eafa0 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 15:09:38 -0400 Subject: [PATCH 03/23] jenkins archive results test --- Jenkinsfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f53811dbe..f38c8a7eb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,15 +5,15 @@ pipeline { stage('Build') { steps { echo 'Building..' - sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' - sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' + #sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' + #sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' } } stage('Test') { steps { echo 'Testing..' - sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' - sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' + #sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' + #sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' } } stage('Deploy') { @@ -22,4 +22,12 @@ pipeline { } } } + post { + always { + COMMIT = ${GIT_REVISION, length=10} + DATE = sh 'echo 20$(date +%y-%m-%d)' + PR = ${PULL_REQUEST} + echo '${DATE}-PR-${PR}-${COMMIT}' + } + } } From bc590e48e0e340c67919218b661e79e8ba6cb364 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 15:16:38 -0400 Subject: [PATCH 04/23] jenkins archive results test 2 --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f38c8a7eb..9981e1db7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,15 +5,15 @@ pipeline { stage('Build') { steps { echo 'Building..' - #sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' - #sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' + //sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' + //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' } } stage('Test') { steps { echo 'Testing..' - #sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' - #sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' + //sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' + //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' } } stage('Deploy') { From 600f85646c6709c8206277e6c4c4f513c35fe2f8 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 15:27:04 -0400 Subject: [PATCH 05/23] jenkins archive results test 3 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9981e1db7..bb0152c16 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ pipeline { } post { always { - COMMIT = ${GIT_REVISION, length=10} + COMMIT = env.GIT_COMMIT.take(10) DATE = sh 'echo 20$(date +%y-%m-%d)' PR = ${PULL_REQUEST} echo '${DATE}-PR-${PR}-${COMMIT}' From a380923aa48f55410bb157948f8467a6a79e560e Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 15:40:05 -0400 Subject: [PATCH 06/23] jenkins archive results test 4 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bb0152c16..a03c786ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,9 +24,9 @@ pipeline { } post { always { - COMMIT = env.GIT_COMMIT.take(10) - DATE = sh 'echo 20$(date +%y-%m-%d)' - PR = ${PULL_REQUEST} + COMMIT=${env.GIT_COMMIT.take(10)} + DATE=sh 'echo 20$(date +%y-%m-%d)' + PR=${PULL_REQUEST} echo '${DATE}-PR-${PR}-${COMMIT}' } } From 2b13944b7097244d6598b6d8465b371a89dc61de Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 15:43:52 -0400 Subject: [PATCH 07/23] jenkins archive results test 5 --- Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a03c786ff..beb4409c7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,10 +24,12 @@ pipeline { } post { always { - COMMIT=${env.GIT_COMMIT.take(10)} - DATE=sh 'echo 20$(date +%y-%m-%d)' - PR=${PULL_REQUEST} - echo '${DATE}-PR-${PR}-${COMMIT}' + steps { + COMMIT=${env.GIT_COMMIT.take(10)} + DATE=sh 'echo 20$(date +%y-%m-%d)' + PR=${PULL_REQUEST} + echo '${DATE}-PR-${PR}-${COMMIT}' + } } } } From 84f2ecea47f64e29960b2ad22f4654b8865f723c Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 15:50:54 -0400 Subject: [PATCH 08/23] jenkins archive results test 6 --- Jenkinsfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index beb4409c7..b629dee28 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,10 @@ pipeline { + environment { + COMMIT=${env.GIT_COMMIT.take(10)} + DATE=sh 'echo 20$(date +%y-%m-%d)' + PR=${PULL_REQUEST} + } + agent any stages { @@ -24,12 +30,7 @@ pipeline { } post { always { - steps { - COMMIT=${env.GIT_COMMIT.take(10)} - DATE=sh 'echo 20$(date +%y-%m-%d)' - PR=${PULL_REQUEST} - echo '${DATE}-PR-${PR}-${COMMIT}' - } + echo '${DATE}-PR-${PR}-${COMMIT}' } } } From 06874c0d8f813b51fba626918a66755f331f2554 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 15:52:28 -0400 Subject: [PATCH 09/23] jenkins archive results test 7 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b629dee28..9bc5c6931 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,8 @@ pipeline { environment { - COMMIT=${env.GIT_COMMIT.take(10)} + COMMIT="${env.GIT_COMMIT.take(10)}" DATE=sh 'echo 20$(date +%y-%m-%d)' - PR=${PULL_REQUEST} + PR="${PULL_REQUEST}" } agent any From 2d2439f263b14b6300ab0c05c136fa3232ec6a77 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 16:01:09 -0400 Subject: [PATCH 10/23] jenkins archive results test 8 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9bc5c6931..9c7fbcef8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { } post { always { - echo '${DATE}-PR-${PR}-${COMMIT}' + echo "${DATE}-PR-${PR}-${COMMIT}" } } } From db13fd08f78d9c33434708016a3e3ac6124f8698 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 16:09:41 -0400 Subject: [PATCH 11/23] jenkins archive results test 9 --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c7fbcef8..95c9c1f7f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,8 @@ pipeline { environment { COMMIT="${env.GIT_COMMIT.take(10)}" - DATE=sh 'echo 20$(date +%y-%m-%d)' + //DATE=sh 'echo 20$(date +%y-%m-%d)' + DATE = sh (script: 'echo echo 20$(date +%y-%m-%d)', returnStdout: true).trim() PR="${PULL_REQUEST}" } From 5548e5d2364a444031571c0c9edce8933b0573d5 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 16:18:13 -0400 Subject: [PATCH 12/23] jenkins archive results test 10 --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 95c9c1f7f..0a606240a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,8 @@ pipeline { environment { COMMIT="${env.GIT_COMMIT.take(10)}" - //DATE=sh 'echo 20$(date +%y-%m-%d)' - DATE = sh (script: 'echo echo 20$(date +%y-%m-%d)', returnStdout: true).trim() - PR="${PULL_REQUEST}" + DATE = sh (script: 'echo 20$(date +%y-%m-%d)', returnStdout: true).trim() + PR="${env.BRANCH_NAME}" } agent any @@ -31,7 +30,7 @@ pipeline { } post { always { - echo "${DATE}-PR-${PR}-${COMMIT}" + echo "${DATE}-${PR}-${COMMIT}" } } } From 9add2a6d5594a9f117abc41292e0c35769babcdc Mon Sep 17 00:00:00 2001 From: wc morrison Date: Wed, 14 Aug 2019 16:24:46 -0400 Subject: [PATCH 13/23] jenkins archive results test 11 --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 0a606240a..7a15fd8e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,6 +31,7 @@ pipeline { post { always { echo "${DATE}-${PR}-${COMMIT}" + sh 'ssh root@c650mnp05-ug "/test/archive/archive_input.sh ${DATE}-${PR}-${COMMIT}"' } } } From 58212672e44f211a545ab457cf1fb3550c302587 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Thu, 15 Aug 2019 13:31:12 -0400 Subject: [PATCH 14/23] jenkins archive results test 12 --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7a15fd8e6..f8ccab590 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,15 +11,15 @@ pipeline { stage('Build') { steps { echo 'Building..' - //sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' - //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' + sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' + sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' } } stage('Test') { steps { echo 'Testing..' - //sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' - //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' + sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' + sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' } } stage('Deploy') { From e31e203a9331a5813a6709220c0fd0fe8175f8b3 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Thu, 15 Aug 2019 14:40:50 -0400 Subject: [PATCH 15/23] jenkins archive results test 13 --- Jenkinsfile | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f8ccab590..3af191ced 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,29 +8,31 @@ pipeline { agent any stages { - stage('Build') { - steps { - echo 'Building..' - sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' - sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' + lock ('myResource') { + stage('Build') { + steps { + echo 'Building..' + //sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' + //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' + } } - } - stage('Test') { - steps { - echo 'Testing..' - sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' - sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' + stage('Test') { + steps { + echo 'Testing..' + //sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' + //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' + } } - } - stage('Deploy') { - steps { - echo 'Deploying....' + stage('Deploy') { + steps { + echo 'Deploying....' + } } } } post { always { - echo "${DATE}-${PR}-${COMMIT}" + //echo "${DATE}-${PR}-${COMMIT}" sh 'ssh root@c650mnp05-ug "/test/archive/archive_input.sh ${DATE}-${PR}-${COMMIT}"' } } From 829764c6aca5cc1eb544e117e0b115ef2c54584f Mon Sep 17 00:00:00 2001 From: wc morrison Date: Thu, 15 Aug 2019 14:53:00 -0400 Subject: [PATCH 16/23] jenkins archive results test 14 --- Jenkinsfile | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3af191ced..87b7b7804 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,30 +6,31 @@ pipeline { } agent any - + options { + lock resource: 'myResource' + } stages { - lock ('myResource') { - stage('Build') { - steps { - echo 'Building..' - //sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' - //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' - } + stage('Build') { + steps { + echo 'Building..' + //sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' + //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' } - stage('Test') { - steps { - echo 'Testing..' - //sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' - //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' - } + } + stage('Test') { + steps { + echo 'Testing..' + //sh 'ssh root@c650mnp05-ug "/test/results/clean_logs.sh"' + //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CAST/csmtest/tools/complete_fvt.sh"' } - stage('Deploy') { - steps { - echo 'Deploying....' - } + } + stage('Deploy') { + steps { + echo 'Deploying....' } } } + post { always { //echo "${DATE}-${PR}-${COMMIT}" From 75e041470a876d633ebeffdf8e705c8ef8b5e3a5 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Thu, 15 Aug 2019 16:28:05 -0400 Subject: [PATCH 17/23] jenkins file update test build 1a --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 87b7b7804..b7e6c62bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { stage('Build') { steps { echo 'Building..' - //sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' + sh 'ssh wcmorris@c650f03p41-ug "/u/wcmorris/CI/build.sh"' //sh 'ssh root@c650mnp05-ug "/u/wcmorris/CI/install.sh"' } } From 005a32858acf6d4540d96396db9995603d61186c Mon Sep 17 00:00:00 2001 From: wc morrison Date: Mon, 19 Aug 2019 13:18:32 -0400 Subject: [PATCH 18/23] jenkins file update test build 2 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b7e6c62bd..f30a5bd7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { environment { COMMIT="${env.GIT_COMMIT.take(10)}" - DATE = sh (script: 'echo 20$(date +%y-%m-%d)', returnStdout: true).trim() + DATE = sh (script: 'echo 20$(date +%y-%m-%d)', returnStdout: true).trim() PR="${env.BRANCH_NAME}" } From c636cff7a00cc96ba826d7ecbe75bb863ae39725 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Mon, 19 Aug 2019 13:37:31 -0400 Subject: [PATCH 19/23] jenkins file update test build (label test) --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f30a5bd7c..d4c9ac924 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,8 @@ pipeline { PR="${env.BRANCH_NAME}" } - agent any + //agent any + agent { label 'csm_fvt_regression' } options { lock resource: 'myResource' } From 50074d4c5662aa6c68be2539650b9d60f5f91e54 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Mon, 19 Aug 2019 14:28:55 -0400 Subject: [PATCH 20/23] jenkins file update test build (label test 1) --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index d4c9ac924..68e36cea2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ pipeline { agent { label 'csm_fvt_regression' } options { lock resource: 'myResource' + timeout(time: 1, unit: 'MINUTE') } stages { stage('Build') { From a934e759553c4389ceca854c00774620d8a4b1c9 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Mon, 19 Aug 2019 14:31:47 -0400 Subject: [PATCH 21/23] jenkins file update test build (label test 2) --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68e36cea2..a0e2c4524 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { agent { label 'csm_fvt_regression' } options { lock resource: 'myResource' - timeout(time: 1, unit: 'MINUTE') + timeout(time: 1, unit: 'MINUTES') } stages { stage('Build') { From 42d2b6c79df8b7e560f156b8ba0b8c35fdef74b6 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Mon, 19 Aug 2019 15:00:54 -0400 Subject: [PATCH 22/23] jenkins file update test build (label test 3) --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a0e2c4524..d4c9ac924 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,6 @@ pipeline { agent { label 'csm_fvt_regression' } options { lock resource: 'myResource' - timeout(time: 1, unit: 'MINUTES') } stages { stage('Build') { From 15398e778b8ad0120929c521baba35f45dd0b5a7 Mon Sep 17 00:00:00 2001 From: wc morrison Date: Mon, 19 Aug 2019 15:04:27 -0400 Subject: [PATCH 23/23] jenkins file update test build (label test 4) --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d4c9ac924..f30a5bd7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,8 +5,7 @@ pipeline { PR="${env.BRANCH_NAME}" } - //agent any - agent { label 'csm_fvt_regression' } + agent any options { lock resource: 'myResource' }