From 1602aa4b0d455c8f2043fac95367d81540960b3a Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 11:01:48 +0200 Subject: [PATCH 001/111] Update Jenkinsfile --- Jenkinsfile | 45 +-------------------------------------------- 1 file changed, 1 insertion(+), 44 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8956ac0..90f6ed4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,27 +11,6 @@ stage('Functional tests') { steps { parallel( - "WWW": { - node(label: 'docker-1.13') { - script { - try { - checkout scm - sh '''docker run -p 8080 -d --name=$BUILD_TAG-ft-www -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" eeacms/www-devel''' - sh '''docker port $BUILD_TAG-ft-www 8080/tcp > url.file;docker_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' $BUILD_TAG-ft-www); sed -i -e "s/0.0.0.0/${docker_ip}/g" url.file''' - sh '''new_url=$(cat url.file);timeout 600 wget --retry-connrefused --tries=60 --waitretry=10 -q http://${new_url}/''' - sh '''new_url=$(cat url.file);casperjs test eea/progressbar/ftests/eea/*.js --url=${new_url} --xunit=ftestsreport.xml''' - } - finally { - sh '''docker stop $BUILD_TAG-ft-www''' - sh '''docker rm -v $BUILD_TAG-ft-www''' - } - } - junit 'ftestsreport.xml' - archiveArtifacts 'screenshot_eea.png' - - } - }, - "KGS": { node(label: 'docker-1.13') { script { @@ -50,29 +29,7 @@ stage('Functional tests') { junit 'ftestsreport.xml' archiveArtifacts 'screenshot_kgs.png' } - }, - - "Plone4": { - node(label: 'docker-1.13') { - script { - try { - checkout scm - sh '''docker run -p 8080 -d --name=$BUILD_TAG-ft-plone4 -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" eeacms/plone-test:4''' - sh '''docker port $BUILD_TAG-ft-plone4 8080/tcp > url.file;docker_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' $BUILD_TAG-ft-plone4); sed -i -e "s/0.0.0.0/${docker_ip}/g" url.file''' - sh '''new_url=$(cat url.file);timeout 600 wget --retry-connrefused --tries=60 --waitretry=10 -q http://${new_url}/''' - sh '''new_url=$(cat url.file);casperjs test eea/progressbar/ftests/plone4/*.js --url=${new_url} --xunit=ftestsreport.xml''' - } - finally { - sh '''docker stop $BUILD_TAG-ft-plone4''' - sh '''docker rm -v $BUILD_TAG-ft-plone4''' - } - } - junit 'ftestsreport.xml' - archiveArtifacts 'screenshot_plone4.png' - - } - - } + } ) } } From 833ea232e2b43cb59347e5960e3a678513f4cc31 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 12:23:38 +0200 Subject: [PATCH 002/111] TEST WHEN --- Jenkinsfile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 90f6ed4c..f9547d28 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,9 +6,15 @@ pipeline { } stages { - -stage('Functional tests') { - steps { + + stage('Functional tests') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { parallel( "KGS": { From eeb1cf33d582a2751ef5d6ccd062c8b2144d6bd6 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 12:28:53 +0200 Subject: [PATCH 003/111] Update Jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f9547d28..3171ad84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,9 +9,8 @@ pipeline { stage('Functional tests') { when { - allOf { + not { environment name: 'CHANGE_ID', value: '' - branch 'master' } } steps { From 1aebd692baabe01be92b400473b4cf4b5f646e51 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 14:59:32 +0200 Subject: [PATCH 004/111] Update Jenkinsfile --- Jenkinsfile | 59 ++++++++++++++++++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3171ad84..048994ee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,41 +1,58 @@ +#!groovy + +import groovy.json.JsonOutput +import groovy.json.JsonSlurper + pipeline { agent any environment { GIT_NAME = "eea.progressbar" + GIT_ORG = "eea" } stages { - stage('Functional tests') { + stage('Pull request checks') { when { not { environment name: 'CHANGE_ID', value: '' } } steps { - parallel( - - "KGS": { - node(label: 'docker-1.13') { - script { - try { - checkout scm - sh '''docker run -p 8080 -d --name=$BUILD_TAG-ft-kgs -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" eeacms/kgs-devel''' - sh '''docker port $BUILD_TAG-ft-kgs 8080/tcp > url.file;docker_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' $BUILD_TAG-ft-kgs); sed -i -e "s/0.0.0.0/${docker_ip}/g" url.file''' - sh '''new_url=$(cat url.file);timeout 600 wget --retry-connrefused --tries=60 --waitretry=10 -q http://${new_url}/''' - sh '''new_url=$(cat url.file);casperjs test eea/progressbar/ftests/kgs/*.js --url=${new_url} --xunit=ftestsreport.xml''' - } - finally { - sh '''docker stop $BUILD_TAG-ft-kgs''' - sh '''docker rm -v $BUILD_TAG-ft-kgs''' - } - } - junit 'ftestsreport.xml' - archiveArtifacts 'screenshot_kgs.png' + + "Check files": { + node { + withCredentials([[$class: 'StringBinding', credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN']]) { + curl -s -H "Authorization: bearer $BEARER_TOKEN" + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def files_changed = jsonSlurper.parseText(response) + def check_version_changed = false + def check_history_changed = false + files_changed.each { + if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { + check_version_changed = true + } + if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { + check_history_changed = true + } + } + if (! check_history_changed) { + error "Pipeline aborted due to no history file changed" + } + if (! check_history_changed) { + error "Pipeline aborted due to no version changed" + } + + + } + } + } } - ) + } } } From ee879d63ef55becf7bf560e6b46b04c3e46e45af Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:04:22 +0200 Subject: [PATCH 005/111] Update Jenkinsfile --- Jenkinsfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 048994ee..2afa832e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,3 @@ -#!groovy - -import groovy.json.JsonOutput -import groovy.json.JsonSlurper pipeline { agent any From 6f1ffe74999ac6e1a8dddbf57bcec0ee1e6ae366 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:10:14 +0200 Subject: [PATCH 006/111] Update Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2afa832e..1cfaa1e9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -50,7 +50,6 @@ pipeline { } } -} } } From 571a561fb6d644e4d9290736eda99a8bca41a904 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:16:35 +0200 Subject: [PATCH 007/111] Update Jenkinsfile --- Jenkinsfile | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1cfaa1e9..9c2b41f3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,37 +19,12 @@ pipeline { "Check files": { node { - withCredentials([[$class: 'StringBinding', credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN']]) { - curl -s -H "Authorization: bearer $BEARER_TOKEN" - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def files_changed = jsonSlurper.parseText(response) - def check_version_changed = false - def check_history_changed = false - files_changed.each { - if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { - check_version_changed = true - } - if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { - check_history_changed = true - } - } - if (! check_history_changed) { - error "Pipeline aborted due to no history file changed" - } - if (! check_history_changed) { - error "Pipeline aborted due to no version changed" - } - - - } } } } } - } + } } From 41634edf89a213a49f32baf4af8e9442f74ecc74 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:24:36 +0200 Subject: [PATCH 008/111] Update Jenkinsfile --- Jenkinsfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c2b41f3..6757bb4c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,3 @@ - pipeline { agent any @@ -9,22 +8,27 @@ pipeline { stages { - stage('Pull request checks') { + stage('Pull request checks') { when { not { environment name: 'CHANGE_ID', value: '' } } steps { - + parallel( + "Check files": { - node { - } - + node(label: 'docker-1.13') { + script { + + } + } } - + ) } - } +} + } } + From b3b289d66a31d3f083549747dd61330a40c6e83a Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:30:25 +0200 Subject: [PATCH 009/111] Update Jenkinsfile --- Jenkinsfile | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6757bb4c..99722c3c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,9 +19,31 @@ pipeline { "Check files": { node(label: 'docker-1.13') { - script { - - } + withCredentials([[$class: 'StringBinding', credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN']]) { + curl -s -H "Authorization: bearer $BEARER_TOKEN" + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def files_changed = jsonSlurper.parseText(response) + def check_version_changed = false + def check_history_changed = false + files_changed.each { + if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { + check_version_changed = true + } + if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { + check_history_changed = true + } + } + if (! check_history_changed) { + error "Pipeline aborted due to no history file changed" + } + if (! check_history_changed) { + error "Pipeline aborted due to no version changed" + } + + + } } } From 23c9a6166ac2e27dbbf491cda34ed0d540919246 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:35:41 +0200 Subject: [PATCH 010/111] Update Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 99722c3c..c8584d0e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,6 @@ pipeline { "Check files": { node(label: 'docker-1.13') { withCredentials([[$class: 'StringBinding', credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN']]) { - curl -s -H "Authorization: bearer $BEARER_TOKEN" def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() def jsonSlurper = new JsonSlurper() From 9fcc7c9bfe0ed236de6c96d7c8be76a043c0c846 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:40:55 +0200 Subject: [PATCH 011/111] Update Jenkinsfile --- Jenkinsfile | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8584d0e..ca4dc876 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,23 +24,7 @@ pipeline { def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() def jsonSlurper = new JsonSlurper() def files_changed = jsonSlurper.parseText(response) - def check_version_changed = false - def check_history_changed = false - files_changed.each { - if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { - check_version_changed = true - } - if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { - check_history_changed = true - } - } - if (! check_history_changed) { - error "Pipeline aborted due to no history file changed" - } - if (! check_history_changed) { - error "Pipeline aborted due to no version changed" - } - + } From daea8daf886b9ffc541849d82c04c1f0997a358a Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:43:40 +0200 Subject: [PATCH 012/111] Update Jenkinsfile --- Jenkinsfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca4dc876..7fb9ccdb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,14 +19,7 @@ pipeline { "Check files": { node(label: 'docker-1.13') { - withCredentials([[$class: 'StringBinding', credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN']]) { - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def files_changed = jsonSlurper.parseText(response) - - - } + } } From 2eb62c5acea5b2427d68df3894f8ac38691438a0 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 15:55:03 +0200 Subject: [PATCH 013/111] Update Jenkinsfile --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 7fb9ccdb..ce85661c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,7 @@ +#!groovy +import groovy.json.JsonOutput +import groovy.json.JsonSlurper + pipeline { agent any From 0d7b3608d6d2e5f44a15f9ddff40e1f057bc96c1 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:02:26 +0200 Subject: [PATCH 014/111] Update Jenkinsfile --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce85661c..5bb9ea92 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,11 @@ pipeline { "Check files": { node(label: 'docker-1.13') { - + withCredentials([string(credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN']]) { + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + + + } } } From bcfb62bb95754823dcf8bbe187a5a245f3b9997b Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:04:52 +0200 Subject: [PATCH 015/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5bb9ea92..846dc2c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { "Check files": { node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN']]) { + withCredentials([string(credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN')]) { def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" From bc19f523080971539f1bdd5a1ef4cc816ddea151 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:12:59 +0200 Subject: [PATCH 016/111] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 846dc2c2..11e3910b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,9 +23,9 @@ pipeline { "Check files": { node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'gitvalentinab2', variable: 'GITHUB_TOKEN')]) { - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - + withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + } From 833cb5657069ab6dd89caaccf91409398374a0e6 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:16:54 +0200 Subject: [PATCH 017/111] Update Jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 11e3910b..97a43b3a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,8 +24,7 @@ pipeline { "Check files": { node(label: 'docker-1.13') { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - + } From e732953c1f24f702a52f2831a48b0c0407ec2d58 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:20:23 +0200 Subject: [PATCH 018/111] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 97a43b3a..047c9f9c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,8 @@ pipeline { "Check files": { node(label: 'docker-1.13') { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + } From c1d84a68f70e7329db8bcb25efd9e8f968224ed5 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:22:37 +0200 Subject: [PATCH 019/111] Update Jenkinsfile --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 047c9f9c..57b19384 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,9 +24,10 @@ pipeline { "Check files": { node(label: 'docker-1.13') { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + script{ + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - + } } } From fe20ce841cf9712d8706f77cf08c3d70422e869e Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:26:43 +0200 Subject: [PATCH 020/111] Update Jenkinsfile --- Jenkinsfile | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 57b19384..b0503e17 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,7 +26,27 @@ pipeline { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def files_changed = jsonSlurper.parseText(response) + def check_version_changed = false + def check_history_changed = false + files_changed.each { + if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { + check_version_changed = true + } + if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { + check_history_changed = true + } + } + if (! check_history_changed) { + error "Pipeline aborted due to no history file changed" + } + if (! check_history_changed) { + error "Pipeline aborted due to no version changed" + } + + } } From a631b6dbf881848888cbe176ba48f0de8e86545b Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:36:57 +0200 Subject: [PATCH 021/111] Update Jenkinsfile --- Jenkinsfile | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b0503e17..83af963a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -26,25 +26,8 @@ pipeline { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def files_changed = jsonSlurper.parseText(response) - def check_version_changed = false - def check_history_changed = false - files_changed.each { - if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { - check_version_changed = true - } - if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { - check_history_changed = true - } - } - if (! check_history_changed) { - error "Pipeline aborted due to no history file changed" - } - if (! check_history_changed) { - error "Pipeline aborted due to no version changed" - } + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + } From bd88772acec31a16edd39649ef147126258377a5 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:45:35 +0200 Subject: [PATCH 022/111] Update Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 83af963a..a6d822ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -27,7 +27,9 @@ pipeline { script{ def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - + def jsonSlurper = new JsonSlurper() + def files_changed = jsonSlurper.parseText(response) + } From 800a0391c6bf876d6c6aebc065a795c75196eb1c Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:50:35 +0200 Subject: [PATCH 023/111] Update Jenkinsfile --- Jenkinsfile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6d822ff..8c8a4c6d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,16 @@ pipeline { def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() def jsonSlurper = new JsonSlurper() def files_changed = jsonSlurper.parseText(response) - + def check_version_changed = "false" + def check_history_changed = "false" + files_changed.each { + if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { + check_version_changed = "true" + } + if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { + check_history_changed = "true" + } + } } From 376c2195e77063de55650971c11aa3a4b2a33814 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:52:25 +0200 Subject: [PATCH 024/111] Update Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8c8a4c6d..20997685 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,12 +32,7 @@ pipeline { def check_version_changed = "false" def check_history_changed = "false" files_changed.each { - if ($it.filename == "eea/progressbar/version.txt" and $it.status == "modified") { - check_version_changed = "true" - } - if ($it.filename == "docs/HISTORY.txt" and $it.status == "modified") { - check_history_changed = "true" - } + } From 67fcac2662bb5e8ceb3e4c9b50fb3acec19b4aac Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 16:57:17 +0200 Subject: [PATCH 025/111] Update Jenkinsfile --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 20997685..6129a63d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,12 @@ pipeline { def check_version_changed = "false" def check_history_changed = "false" files_changed.each { - + if ($it.filename == "eea/progressbar/version.txt" && $it.status == "modified") { + check_version_changed = "true" + } + if ($it.filename == "docs/HISTORY.txt" && $it.status == "modified") { + check_history_changed = "true" + } } From a6b303efb8f11607127079660015e94780bbc7ef Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:00:06 +0200 Subject: [PATCH 026/111] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6129a63d..ac94c779 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,10 +32,10 @@ pipeline { def check_version_changed = "false" def check_history_changed = "false" files_changed.each { - if ($it.filename == "eea/progressbar/version.txt" && $it.status == "modified") { + if (it.filename == "eea/progressbar/version.txt" && it.status == "modified") { check_version_changed = "true" } - if ($it.filename == "docs/HISTORY.txt" && $it.status == "modified") { + if (it.filename == "docs/HISTORY.txt" && it.status == "modified") { check_history_changed = "true" } } From d7224b75b3f51394ae8cef1a001bd76707723bf2 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:05:58 +0200 Subject: [PATCH 027/111] Update Jenkinsfile --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ac94c779..f6e38e9c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,11 +31,13 @@ pipeline { def files_changed = jsonSlurper.parseText(response) def check_version_changed = "false" def check_history_changed = "false" + echo "${response}" files_changed.each { - if (it.filename == "eea/progressbar/version.txt" && it.status == "modified") { + echo "${it}" + if (it["filename"] == "eea/progressbar/version.txt" && it["status"] == "modified") { check_version_changed = "true" } - if (it.filename == "docs/HISTORY.txt" && it.status == "modified") { + if (it["filename"] == "docs/HISTORY.txt" && it["status"] == "modified") { check_history_changed = "true" } } From 4c16e85a569de18c9bcac2f5ec7476474e4c40bd Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:08:33 +0200 Subject: [PATCH 028/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f6e38e9c..b630ec64 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { environment { GIT_NAME = "eea.progressbar" - GIT_ORG = "eea" + GIT_ORG = "valentinab25" } stages { From 3a0de895b31fb44b35081a1f5171acab4f648548 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:11:31 +0200 Subject: [PATCH 029/111] Update Jenkinsfile --- Jenkinsfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b630ec64..91ccfb63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,9 +31,8 @@ pipeline { def files_changed = jsonSlurper.parseText(response) def check_version_changed = "false" def check_history_changed = "false" - echo "${response}" files_changed.each { - echo "${it}" + if (it["filename"] == "eea/progressbar/version.txt" && it["status"] == "modified") { check_version_changed = "true" } @@ -41,6 +40,14 @@ pipeline { check_history_changed = "true" } } + + + if (check_history_changed == "false") { + error "Pipeline aborted due to no history file changed" + } + if (check_version_changed == "false" ) { + error "Pipeline aborted due to no version changed" + } } From 68fcee003396af3a1b8584757ab0c2e59d84ae4c Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:13:11 +0200 Subject: [PATCH 030/111] Update HISTORY.txt --- docs/HISTORY.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index a3daefe0..755b8911 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,7 @@ Changelog ========= + 4.1.dev0 - (unreleased) ----------------------- * Change: Remove Sphinx generated documentation From 40dc0c3ae0705e75df292c004a951b76f3601ab1 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:16:05 +0200 Subject: [PATCH 031/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 3e45b80e..7d5c902e 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.1.dev0 \ No newline at end of file +4.1 From e8504e55c56305342e008ebde22d1eabe010bffa Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:22:38 +0200 Subject: [PATCH 032/111] Update Jenkinsfile --- Jenkinsfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 91ccfb63..b1eee505 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,14 +41,15 @@ pipeline { } } - - if (check_history_changed == "false") { - error "Pipeline aborted due to no history file changed" - } - if (check_version_changed == "false" ) { - error "Pipeline aborted due to no version changed" + if (check_history_changed == "false") { + error "Pipeline aborted due to no history file changed" + } + if (check_version_changed == "false" ) { + error "Pipeline aborted due to no version changed" } - + version = readFile 'eea/progressbar/version.txt' + echo "${version}" + } } From 4e7167ec7475917b631492431f8548dbfe283020 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:52:10 +0200 Subject: [PATCH 033/111] Update Jenkinsfile --- Jenkinsfile | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b1eee505..ff02f366 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ pipeline { parallel( "Check files": { - node(label: 'docker-1.13') { + node() { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" @@ -46,14 +46,31 @@ pipeline { } if (check_version_changed == "false" ) { error "Pipeline aborted due to no version changed" - } - version = readFile 'eea/progressbar/version.txt' - echo "${version}" - + } } } + } + }, + "Check new version": { + node() { + checkout scm + withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { + script{ + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def tags = jsonSlurper.parseText(response) + def check_version = "false" + def check_biggest + tags.each { + + } + + } + } + } } ) From 7fc52a66576ea4b2d0291517855c8dea613b4df5 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 17:57:25 +0200 Subject: [PATCH 034/111] Update Jenkinsfile --- Jenkinsfile | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff02f366..f28f0307 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -51,26 +51,6 @@ pipeline { } } - } - }, - "Check new version": { - node() { - checkout scm - withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - script{ - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def tags = jsonSlurper.parseText(response) - def check_version = "false" - def check_biggest - tags.each { - - } - - } - } - } } ) From 98a0976bbf8f239584254fb76b1d78b37aac27ea Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 18:07:14 +0200 Subject: [PATCH 035/111] Update Jenkinsfile --- Jenkinsfile | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f28f0307..8a2b84a6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,7 +22,7 @@ pipeline { parallel( "Check files": { - node() { + node(label: 'docker-1.13') { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" @@ -46,7 +46,25 @@ pipeline { } if (check_version_changed == "false" ) { error "Pipeline aborted due to no version changed" - } + } + checkout scm + version = readFile 'eea/progressbar/version.txt' + echo "${version}" + + + } + } + + } + }, + "Check versions": { + node(label: 'docker-1.13') { + withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { + script{ + checkout scm + version = readFile 'eea/progressbar/version.txt' + echo "${version}" + } } From 5b255580aa5d7ce0d0abc137f3aa1e888b9383f5 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 18:13:15 +0200 Subject: [PATCH 036/111] Update Jenkinsfile --- Jenkinsfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a2b84a6..8a28b17d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -47,11 +47,7 @@ pipeline { if (check_version_changed == "false" ) { error "Pipeline aborted due to no version changed" } - checkout scm - version = readFile 'eea/progressbar/version.txt' - echo "${version}" - - + } } @@ -63,7 +59,7 @@ pipeline { script{ checkout scm version = readFile 'eea/progressbar/version.txt' - echo "${version}" + echo "Version is ${version}" } From 703b47a3912ae04a7cd1fbec7521913de972ed71 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 18:38:29 +0200 Subject: [PATCH 037/111] Update Jenkinsfile --- Jenkinsfile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8a28b17d..bd18f564 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -60,7 +60,24 @@ pipeline { checkout scm version = readFile 'eea/progressbar/version.txt' echo "Version is ${version}" - + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def tags = jsonSlurper.parseText(response) + def check_version_is_new = "true" + def last_version = files_changed[0]["name"] + + files_changed.each { + + if (it["name"] == version) { + check_version_is_new = "false" + } + } + + if (check_version_is_new == "false") { + error "Pipeline aborted due to no version already present" + } + } } From 29e5433586e028eb731b911bd4e97e7263b78016 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 18:47:21 +0200 Subject: [PATCH 038/111] Update Jenkinsfile --- Jenkinsfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bd18f564..c74ffbb0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,15 +59,15 @@ pipeline { script{ checkout scm version = readFile 'eea/progressbar/version.txt' - echo "Version is ${version}" - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def tags = jsonSlurper.parseText(response) - def check_version_is_new = "true" - def last_version = files_changed[0]["name"] - - files_changed.each { + + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def tags = jsonSlurper.parseText(response) + def check_version_is_new = "true" + def last_version = files_changed[0]["name"] + echo "Version is ${version}, last version is ${last_version}" + tags.each { if (it["name"] == version) { check_version_is_new = "false" From eeca05d829819d0348f63ac82c64ebbedfa8e56f Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 18:58:25 +0200 Subject: [PATCH 039/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c74ffbb0..d6411840 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -65,7 +65,7 @@ pipeline { def jsonSlurper = new JsonSlurper() def tags = jsonSlurper.parseText(response) def check_version_is_new = "true" - def last_version = files_changed[0]["name"] + def last_version = tags[0]["name"] echo "Version is ${version}, last version is ${last_version}" tags.each { From d4361e6525e72d4656bd365dd4a29c9cde60c88b Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 19:01:05 +0200 Subject: [PATCH 040/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 7d5c902e..bd28b9c5 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.1 +3.9 From f3a85d97b0953bfbba500d1ac7591fefbe93b455 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 28 Nov 2017 19:25:26 +0200 Subject: [PATCH 041/111] Update Jenkinsfile --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6411840..533ce8b3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -69,7 +69,7 @@ pipeline { echo "Version is ${version}, last version is ${last_version}" tags.each { - if (it["name"] == version) { + if (it["name"] == "${version}") { check_version_is_new = "false" } } @@ -78,7 +78,15 @@ pipeline { error "Pipeline aborted due to no version already present" } - + String mostRecentVersion( List versions ) { + versions.sort( false ) { a, b -> + [a,b]*.tokenize('.')*.collect { it as int }.with { u, v -> + [u,v].transpose().findResult{ x,y-> x<=>y ?: null } ?: u.size() <=> v.size() + } + }[-1] + } + def lastversion=mostRecentVersion([ "${version}","${last_version}"]) + echo "${lastversion}" } } From 4f6bd8138ed2b9cfdc937f9905f03b8378712d2e Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:22:36 +0200 Subject: [PATCH 042/111] Update Jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 533ce8b3..ae8ca771 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -85,8 +85,7 @@ pipeline { } }[-1] } - def lastversion=mostRecentVersion([ "${version}","${last_version}"]) - echo "${lastversion}" + } } From af944bd328868464b8522d92ae407e19cbfd8dbe Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:26:11 +0200 Subject: [PATCH 043/111] Update Jenkinsfile --- Jenkinsfile | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ae8ca771..ff5007de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,25 +67,17 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] echo "Version is ${version}, last version is ${last_version}" - tags.each { - + tags.each { if (it["name"] == "${version}") { - check_version_is_new = "false" - } + check_version_is_new = "false" + } } if (check_version_is_new == "false") { error "Pipeline aborted due to no version already present" } - String mostRecentVersion( List versions ) { - versions.sort( false ) { a, b -> - [a,b]*.tokenize('.')*.collect { it as int }.with { u, v -> - [u,v].transpose().findResult{ x,y-> x<=>y ?: null } ?: u.size() <=> v.size() - } - }[-1] - } - + } } @@ -97,4 +89,3 @@ pipeline { } } - From 32807143306a1441412f0d1dbbf56b4019ff257b Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:27:32 +0200 Subject: [PATCH 044/111] Update Jenkinsfile --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff5007de..213a87d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,8 +67,9 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] echo "Version is ${version}, last version is ${last_version}" - tags.each { - if (it["name"] == "${version}") { + tags.each { + + if ( "${it['name']}" == "${version}") { check_version_is_new = "false" } } From 096c403b954a9a83759889fbe9ca61de7d2cb00d Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:30:05 +0200 Subject: [PATCH 045/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 213a87d0..ec9fd9ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def last_version = tags[0]["name"] echo "Version is ${version}, last version is ${last_version}" tags.each { - + echo "${it['name']}" if ( "${it['name']}" == "${version}") { check_version_is_new = "false" } From 89d3939646e6b1c7e6d88651e1a12d1abb703622 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:33:13 +0200 Subject: [PATCH 046/111] Update Jenkinsfile --- Jenkinsfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ec9fd9ab..ded3821d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,8 +68,7 @@ pipeline { def last_version = tags[0]["name"] echo "Version is ${version}, last version is ${last_version}" tags.each { - echo "${it['name']}" - if ( "${it['name']}" == "${version}") { + if ( it['name'].equalsIgnoreCase( version ) ) { check_version_is_new = "false" } } From fb6b35ec902c44451dbfcb78b6ca4e97c6553336 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:36:59 +0200 Subject: [PATCH 047/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ded3821d..ca26c464 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,7 @@ pipeline { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ checkout scm - version = readFile 'eea/progressbar/version.txt' + def version = (readFile 'eea/progressbar/version.txt').trim() def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() From 4d5a10f90bd6d23280f8718ee10b84923db16196 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:38:00 +0200 Subject: [PATCH 048/111] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca26c464..6af70a2d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -58,7 +58,8 @@ pipeline { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ checkout scm - def version = (readFile 'eea/progressbar/version.txt').trim() + def version_temp = readFile 'eea/progressbar/version.txt' + def version = version_temp.trim() def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() From 3d7f6dc2b9c3a81508d13545a64eafaf880e8e57 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:43:59 +0200 Subject: [PATCH 049/111] Update Jenkinsfile --- Jenkinsfile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6af70a2d..2763fa54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -74,10 +74,16 @@ pipeline { } } - if (check_version_is_new == "false") { - error "Pipeline aborted due to no version already present" - } - + if (check_version_is_new == "false") { + error "Pipeline aborted due to version already present in tags" + } + def String mostRecentVersion( List versions ) { + versions.sort( false ) { a, b -> + [a,b]*.tokenize('.')*.collect { it as int }.with { u, v -> + [u,v].transpose().findResult{ x,y-> x<=>y ?: null } ?: u.size() <=> v.size() + } + }[-1] + } } } From a1d900569128b4564ed4dd7bde525051b665e4da Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:44:33 +0200 Subject: [PATCH 050/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index bd28b9c5..7d5c902e 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -3.9 +4.1 From 7f91ec91992726aadd46eeaaf077f65738da5a4f Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 11:47:45 +0200 Subject: [PATCH 051/111] Update Jenkinsfile --- Jenkinsfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2763fa54..5046ac1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -77,13 +77,14 @@ pipeline { if (check_version_is_new == "false") { error "Pipeline aborted due to version already present in tags" } - def String mostRecentVersion( List versions ) { - versions.sort( false ) { a, b -> - [a,b]*.tokenize('.')*.collect { it as int }.with { u, v -> - [u,v].transpose().findResult{ x,y-> x<=>y ?: null } ?: u.size() <=> v.size() - } - }[-1] - } + + def versions =[ "${version}", "${last_version}"] + def biggest_version= versions.sort( false ) { a, b -> + [a,b]*.tokenize('.')*.collect { it as int }.with { u, v -> + [u,v].transpose().findResult{ x,y-> x<=>y ?: null } ?: u.size() <=> v.size() + } + }[-1] + } } From 91757d19411638f00ff0bfa77f925e839180cfa5 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:11:31 +0200 Subject: [PATCH 052/111] Update Jenkinsfile --- Jenkinsfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5046ac1b..808dd96d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,12 +79,7 @@ pipeline { } def versions =[ "${version}", "${last_version}"] - def biggest_version= versions.sort( false ) { a, b -> - [a,b]*.tokenize('.')*.collect { it as int }.with { u, v -> - [u,v].transpose().findResult{ x,y-> x<=>y ?: null } ?: u.size() <=> v.size() - } - }[-1] - + } } From 8b3d79f147471d48dd0dec235ea02dd173a7491c Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:21:25 +0200 Subject: [PATCH 053/111] Update Jenkinsfile --- Jenkinsfile | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 808dd96d..618e1967 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,7 +79,28 @@ pipeline { } def versions =[ "${version}", "${last_version}"] - + def sorted = versions.sort(false) { a, b -> + + List verA = a.tokenize('.') + List verB = b.tokenize('.') + + def commonIndices = Math.min(verA.size(), verB.size()) + + for (int i = 0; i < commonIndices; ++i) { + def numA = verA[i].toInteger() + def numB = verB[i].toInteger() + echo "comparing $numA and $numB" + + if (numA != numB) { + return numA <=> numB + } + } + + // If we got this far then all the common indices are identical, so whichever version is longer must be more recent + verA.size() <=> verB.size() + } + + echo "sorted versions: $sorted" } } From 3cff9b5f36cbabfaaa7bd25473f6f7a3352b2150 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:29:49 +0200 Subject: [PATCH 054/111] Update Jenkinsfile --- Jenkinsfile | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 618e1967..0080a2fd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,29 +78,32 @@ pipeline { error "Pipeline aborted due to version already present in tags" } - def versions =[ "${version}", "${last_version}"] - def sorted = versions.sort(false) { a, b -> - - List verA = a.tokenize('.') - List verB = b.tokenize('.') + def versions =[ "${version}", "${last_version}"] + def result = -100 + + List verA = version.tokenize('.') + List verB = last_version.tokenize('.') def commonIndices = Math.min(verA.size(), verB.size()) for (int i = 0; i < commonIndices; ++i) { def numA = verA[i].toInteger() def numB = verB[i].toInteger() - echo "comparing $numA and $numB" + echo "comparing ${numA} and ${numB}" if (numA != numB) { - return numA <=> numB + result = numA <=> numB + break; } } - - // If we got this far then all the common indices are identical, so whichever version is longer must be more recent - verA.size() <=> verB.size() + + if ( result == -100) { + result = verA.size() <=> verB.size() + } + } - echo "sorted versions: $sorted" + echo "sorted versions: ${result}" } } From 981f4d96931a3ee083467340c4ae4180093e65a1 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:31:07 +0200 Subject: [PATCH 055/111] Update Jenkinsfile --- Jenkinsfile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0080a2fd..6a8f6823 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -80,28 +80,25 @@ pipeline { def versions =[ "${version}", "${last_version}"] def result = -100 - - List verA = version.tokenize('.') - List verB = last_version.tokenize('.') - - def commonIndices = Math.min(verA.size(), verB.size()) + List verA = version.tokenize('.') + List verB = last_version.tokenize('.') + def commonIndices = Math.min(verA.size(), verB.size()) for (int i = 0; i < commonIndices; ++i) { def numA = verA[i].toInteger() def numB = verB[i].toInteger() - echo "comparing ${numA} and ${numB}" + echo "comparing ${numA} and ${numB}" if (numA != numB) { result = numA <=> numB - break; + break } } if ( result == -100) { result = verA.size() <=> verB.size() } - - } + echo "sorted versions: ${result}" From d1617cbdb6a83046499893595a533ebd5204cc54 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:35:07 +0200 Subject: [PATCH 056/111] Update Jenkinsfile --- Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a8f6823..2f4c495e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -82,7 +82,10 @@ pipeline { def result = -100 List verA = version.tokenize('.') List verB = last_version.tokenize('.') - def commonIndices = Math.min(verA.size(), verB.size()) + def commonIndices = verA.size() + if (verB.size() < commonIndices) { + commonIndices = verB.size() + } for (int i = 0; i < commonIndices; ++i) { def numA = verA[i].toInteger() From 02356b4d1e9e50918a02499d5e6de7fa35457dd5 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:38:25 +0200 Subject: [PATCH 057/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2f4c495e..b3807138 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,7 +78,7 @@ pipeline { error "Pipeline aborted due to version already present in tags" } - def versions =[ "${version}", "${last_version}"] + def versions =[ "${last_version}", "${version}"] def result = -100 List verA = version.tokenize('.') List verB = last_version.tokenize('.') From 1a03d9bb9b4f1d60f3a43110dce27c5aed772759 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:42:07 +0200 Subject: [PATCH 058/111] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index b3807138..f7e39688 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,6 +94,7 @@ pipeline { if (numA != numB) { result = numA <=> numB + echo "result versions: ${result}" break } } From 096b5986a7f2e82bbd03d83eec06fecef7b20a92 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:44:14 +0200 Subject: [PATCH 059/111] Update Jenkinsfile --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f7e39688..a61f7435 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,10 +78,9 @@ pipeline { error "Pipeline aborted due to version already present in tags" } - def versions =[ "${last_version}", "${version}"] def result = -100 - List verA = version.tokenize('.') - List verB = last_version.tokenize('.') + List verB = version.tokenize('.') + List verA = last_version.tokenize('.') def commonIndices = verA.size() if (verB.size() < commonIndices) { commonIndices = verB.size() From 42fe99f2e3daaa1047a0e5d11b130c1fae3dae79 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:48:07 +0200 Subject: [PATCH 060/111] Update Jenkinsfile --- Jenkinsfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a61f7435..6e083249 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,8 +79,8 @@ pipeline { } def result = -100 - List verB = version.tokenize('.') - List verA = last_version.tokenize('.') + List verA = version.tokenize('.') + List verB = last_version.tokenize('.') def commonIndices = verA.size() if (verB.size() < commonIndices) { commonIndices = verB.size() @@ -103,7 +103,9 @@ pipeline { } - echo "sorted versions: ${result}" + if ( result == -1 ) { + error "Pipeline aborted due to version ${version} being smaller than last version ${last_version}" + } } } From 2bc655aaba77b4b1ba8c1d5f262effe69e0d1a6a Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:48:58 +0200 Subject: [PATCH 061/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 7d5c902e..819e07a2 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.1 +5.0 From 6f2eaa7d8c82665cefcc175191837d74c0884eec Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:49:58 +0200 Subject: [PATCH 062/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 819e07a2..2e0e38c6 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -5.0 +1.9 From a1f155e209ee2efdaf662e6c46bb7ba64dd8f4c9 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:50:29 +0200 Subject: [PATCH 063/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 2e0e38c6..1454f6ed 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -1.9 +4.0.1 From e3bc533d52227bcbd192bec945bc70d305df8b7e Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:51:11 +0200 Subject: [PATCH 064/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 1454f6ed..b04bfd83 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.0.1 +3.9.9 From 88c5ed946adf9568284ed2ab33f2713834f1db55 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 12:53:43 +0200 Subject: [PATCH 065/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index b04bfd83..7d5c902e 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -3.9.9 +4.1 From f1ecc1e67369a53bb4221bb83e5dfaf64953b915 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:21:28 +0200 Subject: [PATCH 066/111] Update Jenkinsfile --- Jenkinsfile | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e083249..e86e2be5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -67,7 +67,12 @@ pipeline { def tags = jsonSlurper.parseText(response) def check_version_is_new = "true" def last_version = tags[0]["name"] - echo "Version is ${version}, last version is ${last_version}" + + if ( version !=~ ^(\d+)\.(\d+)$ ) { + error "Version ${version} does not respect format: \"number.number\", please change it" + } + + tags.each { if ( it['name'].equalsIgnoreCase( version ) ) { check_version_is_new = "false" @@ -78,30 +83,17 @@ pipeline { error "Pipeline aborted due to version already present in tags" } - def result = -100 - List verA = version.tokenize('.') + List verA = version.tokenize('.') List verB = last_version.tokenize('.') - def commonIndices = verA.size() - if (verB.size() < commonIndices) { - commonIndices = verB.size() - } - - for (int i = 0; i < commonIndices; ++i) { + for (int i = 0; i < 2; ++i) { def numA = verA[i].toInteger() def numB = verB[i].toInteger() - echo "comparing ${numA} and ${numB}" - if (numA != numB) { result = numA <=> numB - echo "result versions: ${result}" - break + break } } - - if ( result == -100) { - result = verA.size() <=> verB.size() - } - + if ( result == -1 ) { error "Pipeline aborted due to version ${version} being smaller than last version ${last_version}" From 3638a9b69e535eab6c51dedfc447298ee5364556 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:22:09 +0200 Subject: [PATCH 067/111] Update Jenkinsfile --- Jenkinsfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e86e2be5..b55d0d9f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,9 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( version !=~ ^(\d+)\.(\d+)$ ) { - error "Version ${version} does not respect format: \"number.number\", please change it" - } + tags.each { From 6bfab1d85f3d6f5886519df8f405b3bf64783202 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:22:57 +0200 Subject: [PATCH 068/111] Update Jenkinsfile --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index b55d0d9f..d11ad944 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,9 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - + if ( version !=~ "^(\d+)\.(\d+)$" ) { + error "Version ${version} does not respect format: \"number.number\", please change it" + } tags.each { From 94cc030ce1249d114effa4912434d98d0f0f78ea Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:24:32 +0200 Subject: [PATCH 069/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d11ad944..a93add05 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( version !=~ "^(\d+)\.(\d+)$" ) { + if ( version.matcher("^(\d+)\.(\d+)$").matches() ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 224c00f10d225b19424ef8b57317087abe2e9b39 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:27:36 +0200 Subject: [PATCH 070/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a93add05..cff39700 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( version.matcher("^(\d+)\.(\d+)$").matches() ) { + if ( version !=~ /^(\d+)\.(\d+)$/ ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 9014473f42062f2fc8dae504dc643a631cd148fa Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:29:53 +0200 Subject: [PATCH 071/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cff39700..ad561534 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( version !=~ /^(\d+)\.(\d+)$/ ) { + if ( version !=~ /(\d+)\.(\d+)/ ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 85d1869eee9ea545d7cf3e731f776554de9d542b Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:33:28 +0200 Subject: [PATCH 072/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ad561534..ee45a6f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( version !=~ /(\d+)\.(\d+)/ ) { + if ( version !=~ /\d+\.\d+/ ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 081faacc48b7f035e5482f9bf76c424b9961bd2f Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 13:34:38 +0200 Subject: [PATCH 073/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee45a6f6..4bf5d8d9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( version !=~ /\d+\.\d+/ ) { + if ( version !=~ /^\d+\.\d+$/ ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 27daed39e92eae891edd5033007100ef25826638 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:01:19 +0200 Subject: [PATCH 074/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4bf5d8d9..6a0a3e13 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( version !=~ /^\d+\.\d+$/ ) { + if ( "4.1" !=~ /^\d+\.\d+$/ ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 22ff4bdbf2ea376fa6d545d384586c13bf11fa38 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:05:09 +0200 Subject: [PATCH 075/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a0a3e13..ddb1f10c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( "4.1" !=~ /^\d+\.\d+$/ ) { + if ( "4.1" !=~ /(\d+)\.(\d+)/ ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From dcd7613dc142c98d8a7dafe4e589e4f4ae201d57 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:09:45 +0200 Subject: [PATCH 076/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ddb1f10c..8c47ea55 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( "4.1" !=~ /(\d+)\.(\d+)/ ) { + if ( ! ( version !=~ /(\d+)\.(\d+)/ ) ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 90542c26effa671dd534fe74029cc867e0df89bf Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:10:55 +0200 Subject: [PATCH 077/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 7d5c902e..30b26dfb 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.1 +4.0.11 From 92df9564d1d0b32df3b11bbdffba7aa0922bdd18 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:12:31 +0200 Subject: [PATCH 078/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8c47ea55..7acdd6cb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -68,7 +68,7 @@ pipeline { def check_version_is_new = "true" def last_version = tags[0]["name"] - if ( ! ( version !=~ /(\d+)\.(\d+)/ ) ) { + if ( ! ( version ==~ /(\d+)\.(\d+)/ ) ) { error "Version ${version} does not respect format: \"number.number\", please change it" } From 769374cc9d98cbfea5f3592b407b34a080717856 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:13:21 +0200 Subject: [PATCH 079/111] Update version.txt --- eea/progressbar/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/progressbar/version.txt b/eea/progressbar/version.txt index 30b26dfb..7d5c902e 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.0.11 +4.1 From 22b599d4151c2670fb69d461e19881d1d1473fdc Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:15:47 +0200 Subject: [PATCH 080/111] Update Jenkinsfile --- Jenkinsfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7acdd6cb..2e8eadf9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!groovy -import groovy.json.JsonOutput + import groovy.json.JsonSlurper pipeline { @@ -8,6 +8,8 @@ pipeline { environment { GIT_NAME = "eea.progressbar" GIT_ORG = "valentinab25" + GIT_VERSIONFILE = "eea/progressbar/version.txt" + GIT_HISTORYFILE = "docs/HISTORY.txt" } stages { @@ -33,10 +35,10 @@ pipeline { def check_history_changed = "false" files_changed.each { - if (it["filename"] == "eea/progressbar/version.txt" && it["status"] == "modified") { + if (it["filename"] == "${GIT_VERSIONFILE}" && it["status"] == "modified") { check_version_changed = "true" } - if (it["filename"] == "docs/HISTORY.txt" && it["status"] == "modified") { + if (it["filename"] == "${GIT_HISTORYFILE}" && it["status"] == "modified") { check_history_changed = "true" } } @@ -58,7 +60,7 @@ pipeline { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ checkout scm - def version_temp = readFile 'eea/progressbar/version.txt' + def version_temp = readFile GIT_VERSIONFILE def version = version_temp.trim() def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" From 9d2b1a5a9cfd00ea404c3dd811235c99148edae1 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:19:54 +0200 Subject: [PATCH 081/111] Update Jenkinsfile --- Jenkinsfile | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2e8eadf9..3e3666ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,6 +108,32 @@ pipeline { } ) } +}, + + stage('Master branch release and tag') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { + + "Release": { + node(label: 'docker-1.13') { + + + } + }, + + "Tag": { + node(label: 'docker-1.13') { + + + } + }, + + } } } From 2498726b6bd9ed19eead5708dadb77a716d24cda Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:21:12 +0200 Subject: [PATCH 082/111] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e3666ef..0ebe20a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -131,10 +131,10 @@ pipeline { } - }, - + } } } + } } From b158b20a00d63e030f99554b0faf37f87d648b09 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:23:49 +0200 Subject: [PATCH 083/111] Update Jenkinsfile --- Jenkinsfile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0ebe20a0..a6c0780e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -110,7 +110,7 @@ pipeline { } }, - stage('Master branch release and tag') { + stage('Master branch release and tag') { when { allOf { environment name: 'CHANGE_ID', value: '' @@ -118,22 +118,22 @@ pipeline { } } steps { - + parallel( "Release": { node(label: 'docker-1.13') { - - } }, "Tag": { - node(label: 'docker-1.13') { - - + node(label: 'docker-1.13') { } - } + } + ) } -} +} + + + } From 64a60ff5eb332cc37c602258060d1445a2393fed Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:30:52 +0200 Subject: [PATCH 084/111] Update Jenkinsfile --- Jenkinsfile | 230 +++++++++++++++++++++++----------------------------- 1 file changed, 102 insertions(+), 128 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a6c0780e..f3b36112 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,138 +3,112 @@ import groovy.json.JsonSlurper pipeline { - agent any + agent any - environment { - GIT_NAME = "eea.progressbar" - GIT_ORG = "valentinab25" - GIT_VERSIONFILE = "eea/progressbar/version.txt" - GIT_HISTORYFILE = "docs/HISTORY.txt" - } + environment { + GIT_NAME = "eea.progressbar" + GIT_ORG = "valentinab25" + GIT_VERSIONFILE = "eea/progressbar/version.txt" + GIT_HISTORYFILE = "docs/HISTORY.txt" + } + + stages { - stages { - stage('Pull request checks') { - when { - not { - environment name: 'CHANGE_ID', value: '' - } - } - steps { - parallel( - - "Check files": { - node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - script{ - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def files_changed = jsonSlurper.parseText(response) - def check_version_changed = "false" - def check_history_changed = "false" - files_changed.each { - - if (it["filename"] == "${GIT_VERSIONFILE}" && it["status"] == "modified") { - check_version_changed = "true" - } - if (it["filename"] == "${GIT_HISTORYFILE}" && it["status"] == "modified") { - check_history_changed = "true" - } - } - - if (check_history_changed == "false") { - error "Pipeline aborted due to no history file changed" - } - if (check_version_changed == "false" ) { - error "Pipeline aborted due to no version changed" - } - - } - } - - } - }, - "Check versions": { - node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - script{ - checkout scm - def version_temp = readFile GIT_VERSIONFILE - def version = version_temp.trim() - - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def tags = jsonSlurper.parseText(response) - def check_version_is_new = "true" - def last_version = tags[0]["name"] - - if ( ! ( version ==~ /(\d+)\.(\d+)/ ) ) { - error "Version ${version} does not respect format: \"number.number\", please change it" - } - - - tags.each { - if ( it['name'].equalsIgnoreCase( version ) ) { - check_version_is_new = "false" - } - } - - if (check_version_is_new == "false") { - error "Pipeline aborted due to version already present in tags" - } - - List verA = version.tokenize('.') - List verB = last_version.tokenize('.') - for (int i = 0; i < 2; ++i) { - def numA = verA[i].toInteger() - def numB = verB[i].toInteger() - if (numA != numB) { - result = numA <=> numB - break - } - } - - - if ( result == -1 ) { - error "Pipeline aborted due to version ${version} being smaller than last version ${last_version}" - } - - } - } - - } + when { + not { + environment name: 'CHANGE_ID', value: '' + } + } + steps { + parallel( + + "Check files": { + node(label: 'docker-1.13') { + withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { + script { + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def files_changed = jsonSlurper.parseText(response) + def check_version_changed = "false" + def check_history_changed = "false" + files_changed.each { + + if (it["filename"] == "${GIT_VERSIONFILE}" && it["status"] == "modified") { + check_version_changed = "true" + } + if (it["filename"] == "${GIT_HISTORYFILE}" && it["status"] == "modified") { + check_history_changed = "true" } - ) + } + + if (check_history_changed == "false") { + error "Pipeline aborted due to no history file changed" + } + if (check_version_changed == "false") { + error "Pipeline aborted due to no version changed" + } + + } + } + } -}, - - stage('Master branch release and tag') { - when { - allOf { - environment name: 'CHANGE_ID', value: '' - branch 'master' - } - } - steps { - parallel( - "Release": { - node(label: 'docker-1.13') { - } - }, - - "Tag": { - node(label: 'docker-1.13') { - } - } - ) + }, + "Check versions": { + node(label: 'docker-1.13') { + withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { + script { + checkout scm + def version_temp = readFile GIT_VERSIONFILE + def version = version_temp.trim() + + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def tags = jsonSlurper.parseText(response) + def check_version_is_new = "true" + def last_version = tags[0]["name"] + + if (!(version == ~/(\d+)\.(\d+)/)) { + error "Version ${version} does not respect format: \"number.number\", please change it" + } + + + tags.each { + if (it['name'].equalsIgnoreCase(version)) { + check_version_is_new = "false" + } + } + + if (check_version_is_new == "false") { + error "Pipeline aborted due to version already present in tags" + } + + List verA = version.tokenize('.') + List verB = last_version.tokenize('.') + for (int i = 0; i < 2; ++i) { + def numA = verA[i].toInteger() + def numB = verB[i].toInteger() + if (numA != numB) { + result = numA <= > numB + break + } + } + + + if (result == -1) { + error "Pipeline aborted due to version ${version} being smaller than last version ${last_version}" + } + + } + } + } -} - - - - - } - + } + ) + } + } + } + } From a7ac9bfc7a57db199ea629d72a83ce3d7c2b6807 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:32:32 +0200 Subject: [PATCH 085/111] Update Jenkinsfile --- Jenkinsfile | 206 ++++++++++++++++++++++++++-------------------------- 1 file changed, 103 insertions(+), 103 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f3b36112..2e8eadf9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,112 +3,112 @@ import groovy.json.JsonSlurper pipeline { - agent any + agent any - environment { - GIT_NAME = "eea.progressbar" - GIT_ORG = "valentinab25" - GIT_VERSIONFILE = "eea/progressbar/version.txt" - GIT_HISTORYFILE = "docs/HISTORY.txt" - } - - stages { - - stage('Pull request checks') { - when { - not { - environment name: 'CHANGE_ID', value: '' + environment { + GIT_NAME = "eea.progressbar" + GIT_ORG = "valentinab25" + GIT_VERSIONFILE = "eea/progressbar/version.txt" + GIT_HISTORYFILE = "docs/HISTORY.txt" } - } - steps { - parallel( - - "Check files": { - node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - script { - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def files_changed = jsonSlurper.parseText(response) - def check_version_changed = "false" - def check_history_changed = "false" - files_changed.each { - - if (it["filename"] == "${GIT_VERSIONFILE}" && it["status"] == "modified") { - check_version_changed = "true" - } - if (it["filename"] == "${GIT_HISTORYFILE}" && it["status"] == "modified") { - check_history_changed = "true" - } - } - - if (check_history_changed == "false") { - error "Pipeline aborted due to no history file changed" - } - if (check_version_changed == "false") { - error "Pipeline aborted due to no version changed" - } - - } - } - - } - }, - "Check versions": { - node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - script { - checkout scm - def version_temp = readFile GIT_VERSIONFILE - def version = version_temp.trim() - - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def tags = jsonSlurper.parseText(response) - def check_version_is_new = "true" - def last_version = tags[0]["name"] - if (!(version == ~/(\d+)\.(\d+)/)) { - error "Version ${version} does not respect format: \"number.number\", please change it" - } - - - tags.each { - if (it['name'].equalsIgnoreCase(version)) { - check_version_is_new = "false" - } - } - - if (check_version_is_new == "false") { - error "Pipeline aborted due to version already present in tags" - } - - List verA = version.tokenize('.') - List verB = last_version.tokenize('.') - for (int i = 0; i < 2; ++i) { - def numA = verA[i].toInteger() - def numB = verB[i].toInteger() - if (numA != numB) { - result = numA <= > numB - break + stages { + + stage('Pull request checks') { + when { + not { + environment name: 'CHANGE_ID', value: '' + } + } + steps { + parallel( + + "Check files": { + node(label: 'docker-1.13') { + withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { + script{ + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def files_changed = jsonSlurper.parseText(response) + def check_version_changed = "false" + def check_history_changed = "false" + files_changed.each { + + if (it["filename"] == "${GIT_VERSIONFILE}" && it["status"] == "modified") { + check_version_changed = "true" + } + if (it["filename"] == "${GIT_HISTORYFILE}" && it["status"] == "modified") { + check_history_changed = "true" + } + } + + if (check_history_changed == "false") { + error "Pipeline aborted due to no history file changed" + } + if (check_version_changed == "false" ) { + error "Pipeline aborted due to no version changed" + } + + } + } + + } + }, + "Check versions": { + node(label: 'docker-1.13') { + withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { + script{ + checkout scm + def version_temp = readFile GIT_VERSIONFILE + def version = version_temp.trim() + + def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" + def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() + def jsonSlurper = new JsonSlurper() + def tags = jsonSlurper.parseText(response) + def check_version_is_new = "true" + def last_version = tags[0]["name"] + + if ( ! ( version ==~ /(\d+)\.(\d+)/ ) ) { + error "Version ${version} does not respect format: \"number.number\", please change it" + } + + + tags.each { + if ( it['name'].equalsIgnoreCase( version ) ) { + check_version_is_new = "false" + } + } + + if (check_version_is_new == "false") { + error "Pipeline aborted due to version already present in tags" + } + + List verA = version.tokenize('.') + List verB = last_version.tokenize('.') + for (int i = 0; i < 2; ++i) { + def numA = verA[i].toInteger() + def numB = verB[i].toInteger() + if (numA != numB) { + result = numA <=> numB + break + } + } + + + if ( result == -1 ) { + error "Pipeline aborted due to version ${version} being smaller than last version ${last_version}" + } + + } + } + + } } - } - - - if (result == -1) { - error "Pipeline aborted due to version ${version} being smaller than last version ${last_version}" - } - - } - } - + ) } - } - ) - } - } - } - +} + } + } From ebea02fec9eac0518efb744b5640113ae9ae8a01 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:34:15 +0200 Subject: [PATCH 086/111] Update Jenkinsfile --- Jenkinsfile | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e8eadf9..7f46c15d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,7 +108,31 @@ pipeline { } ) } -} +}, + + stage('Master branch release and tag') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { + parallel( + "Release": { + node(label: 'docker-1.13') { + + } + }, + + "Tag": { + node(label: 'docker-1.13') { + + } + } + ) + } + } } } From c2e4ad3630372da394b1987131994c2232db05d1 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:35:14 +0200 Subject: [PATCH 087/111] Update Jenkinsfile --- Jenkinsfile | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7f46c15d..2e8eadf9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -108,31 +108,7 @@ pipeline { } ) } -}, - - stage('Master branch release and tag') { - when { - allOf { - environment name: 'CHANGE_ID', value: '' - branch 'master' - } - } - steps { - parallel( - "Release": { - node(label: 'docker-1.13') { - - } - }, - - "Tag": { - node(label: 'docker-1.13') { - - } - } - ) - } - } +} } } From 6e7dcbee962b4ab8fd106742aab470895e4c77b8 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:41:18 +0200 Subject: [PATCH 088/111] Update Jenkinsfile --- Jenkinsfile | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2e8eadf9..d1a7786d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,31 @@ pipeline { } stages { - + stage('Master branch release and tag') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { + parallel( + + "Release": { + node(label: 'docker-1.13') { + } + }, + + "Tag": { + node(label: 'docker-1.13') { + } + } + ) + } + }, + + + stage('Pull request checks') { when { not { From ef4c7b4b4e2aac743ccd6ceee6bf4382a821669c Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:43:14 +0200 Subject: [PATCH 089/111] Update Jenkinsfile --- Jenkinsfile | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d1a7786d..1a2b9caf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,29 +13,39 @@ pipeline { } stages { + stage('Master branch release and tag') { when { allOf { environment name: 'CHANGE_ID', value: '' - branch 'master' + branch 'master' } } steps { parallel( - "Release": { - node(label: 'docker-1.13') { - } - }, - - "Tag": { + "KGS": { node(label: 'docker-1.13') { - } - } - ) - } - }, - + script { + try { + checkout scm + sh '''docker run -p 8080 -d --name=$BUILD_TAG-ft-kgs -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" eeacms/kgs-devel''' + sh '''docker port $BUILD_TAG-ft-kgs 8080/tcp > url.file;docker_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' $BUILD_TAG-ft-kgs); sed -i -e "s/0.0.0.0/${docker_ip}/g" url.file''' + sh '''new_url=$(cat url.file);timeout 600 wget --retry-connrefused --tries=60 --waitretry=10 -q http://${new_url}/''' + sh '''new_url=$(cat url.file);casperjs test eea/progressbar/ftests/kgs/*.js --url=${new_url} --xunit=ftestsreport.xml''' + } + finally { + sh '''docker stop $BUILD_TAG-ft-kgs''' + sh '''docker rm -v $BUILD_TAG-ft-kgs''' + } + } + junit 'ftestsreport.xml' + archiveArtifacts 'screenshot_kgs.png' + } + } + ) + } +}, stage('Pull request checks') { From 369b48780b3916822b4a0adf5f7a7b5421286bde Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:47:14 +0200 Subject: [PATCH 090/111] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1a2b9caf..b66c54f7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { stages { - stage('Master branch release and tag') { + stage('Master branch release and tag') { when { allOf { environment name: 'CHANGE_ID', value: '' @@ -45,7 +45,7 @@ pipeline { } ) } -}, + }, stage('Pull request checks') { From 6a22aab1fe8ad5af8be9b45e04a363e5771f4a30 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:47:38 +0200 Subject: [PATCH 091/111] Update Jenkinsfile --- Jenkinsfile | 33 +-------------------------------- 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b66c54f7..afa2e0dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,38 +14,7 @@ pipeline { stages { - stage('Master branch release and tag') { - when { - allOf { - environment name: 'CHANGE_ID', value: '' - branch 'master' - } - } - steps { - parallel( - - "KGS": { - node(label: 'docker-1.13') { - script { - try { - checkout scm - sh '''docker run -p 8080 -d --name=$BUILD_TAG-ft-kgs -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" eeacms/kgs-devel''' - sh '''docker port $BUILD_TAG-ft-kgs 8080/tcp > url.file;docker_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.Gateway}}{{end}}' $BUILD_TAG-ft-kgs); sed -i -e "s/0.0.0.0/${docker_ip}/g" url.file''' - sh '''new_url=$(cat url.file);timeout 600 wget --retry-connrefused --tries=60 --waitretry=10 -q http://${new_url}/''' - sh '''new_url=$(cat url.file);casperjs test eea/progressbar/ftests/kgs/*.js --url=${new_url} --xunit=ftestsreport.xml''' - } - finally { - sh '''docker stop $BUILD_TAG-ft-kgs''' - sh '''docker rm -v $BUILD_TAG-ft-kgs''' - } - } - junit 'ftestsreport.xml' - archiveArtifacts 'screenshot_kgs.png' - } - } - ) - } - }, + stage('Pull request checks') { From c53c443e70b3e9ad93d23e61ade2a5d826bfde0a Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:50:03 +0200 Subject: [PATCH 092/111] Update Jenkinsfile --- Jenkinsfile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index afa2e0dc..2a8a52c9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,8 +13,23 @@ pipeline { } stages { - - + stage('Master branch release and tag') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { + parallel( + + "Check files": { + node(label: 'docker-1.13') { + } + } + ) + } + }, stage('Pull request checks') { From c16de05e6b7b6dacfde8541cbdb3280bb48f5bfb Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:51:30 +0200 Subject: [PATCH 093/111] Update Jenkinsfile --- Jenkinsfile | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2a8a52c9..174d50a0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { } stages { - stage('Master branch release and tag') { + stage('Master branch') { when { allOf { environment name: 'CHANGE_ID', value: '' @@ -21,15 +21,8 @@ pipeline { } } steps { - parallel( - - "Check files": { - node(label: 'docker-1.13') { - } - } - ) - } - }, + } + }, stage('Pull request checks') { From 7b6518034b8a5736bf9d8da070be9ea3de6541c1 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:52:34 +0200 Subject: [PATCH 094/111] Update Jenkinsfile --- Jenkinsfile | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 174d50a0..490cf963 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,16 +13,28 @@ pipeline { } stages { - stage('Master branch') { - when { + + stage('Master branch release and tag') { + when { allOf { environment name: 'CHANGE_ID', value: '' branch 'master' } } - steps { - } - }, + steps { + parallel( + "Release": { + node(label: 'docker-1.13') { + } + }, + + "Tag": { + node(label: 'docker-1.13') { + } + } + ) + } +} stage('Pull request checks') { From 628343d7df411c098c3f0907805138b126b59945 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 29 Nov 2017 14:58:42 +0200 Subject: [PATCH 095/111] Update Jenkinsfile --- Jenkinsfile | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 490cf963..8779315c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,27 +14,6 @@ pipeline { stages { - stage('Master branch release and tag') { - when { - allOf { - environment name: 'CHANGE_ID', value: '' - branch 'master' - } - } - steps { - parallel( - "Release": { - node(label: 'docker-1.13') { - } - }, - - "Tag": { - node(label: 'docker-1.13') { - } - } - ) - } -} stage('Pull request checks') { @@ -132,6 +111,29 @@ pipeline { ) } } + + stage('Master branch release and tag') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { + parallel( + "Release": { + node(label: 'docker-1.13') { + } + }, + + "Tag": { + node(label: 'docker-1.13') { + } + } + ) + } +} + } } From 98546d81f8698aed90a100221a23a305d35661af Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Tue, 12 Dec 2017 18:57:53 +0200 Subject: [PATCH 096/111] Update Jenkinsfile --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8779315c..84f29346 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -123,6 +123,10 @@ pipeline { parallel( "Release": { node(label: 'docker-1.13') { + checkout([$class: 'GitSCM', branches: [[name: '*/master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'eea.plonebuildout.core']], submoduleCfg: [], userRemoteConfigs: [[url: 'https://github.com/eea/eea.plonebuildout.core.git']]]) + + + } }, From c65a351c13cc8a9c8d2ee39b236fb3e807c3dca7 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 11:22:35 +0200 Subject: [PATCH 097/111] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 84f29346..8f5e9777 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,6 +29,7 @@ pipeline { node(label: 'docker-1.13') { withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { script{ + sh '''env''' def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() def jsonSlurper = new JsonSlurper() From 1949653fa7a1e2c4f33b0796c1a1f3b20a95e44f Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 17:58:18 +0200 Subject: [PATCH 098/111] Update Jenkinsfile --- Jenkinsfile | 95 ++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 81 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8f5e9777..120a6b0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,92 +21,25 @@ pipeline { not { environment name: 'CHANGE_ID', value: '' } + environment name: 'CHANGE_TARGET', value: 'master' } steps { parallel( - "Check files": { + "Check PR": { node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - script{ - sh '''env''' - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/pulls/${env.CHANGE_ID}/files" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def files_changed = jsonSlurper.parseText(response) - def check_version_changed = "false" - def check_history_changed = "false" - files_changed.each { - - if (it["filename"] == "${GIT_VERSIONFILE}" && it["status"] == "modified") { - check_version_changed = "true" - } - if (it["filename"] == "${GIT_HISTORYFILE}" && it["status"] == "modified") { - check_history_changed = "true" - } - } - - if (check_history_changed == "false") { - error "Pipeline aborted due to no history file changed" - } - if (check_version_changed == "false" ) { - error "Pipeline aborted due to no version changed" - } - - } - } - - } - }, - "Check versions": { - node(label: 'docker-1.13') { - withCredentials([string(credentialsId: 'GitHubTokentest', variable: 'GITHUB_TOKEN')]) { - script{ - checkout scm - def version_temp = readFile GIT_VERSIONFILE - def version = version_temp.trim() - - def apiUrl = "https://api.github.com/repos/${env.GIT_ORG}/${env.GIT_NAME}/tags" - def response = sh(returnStdout: true, script: "curl -s -H \"Authorization: Token ${env.GITHUB_TOKEN}\" ${apiUrl}").trim() - def jsonSlurper = new JsonSlurper() - def tags = jsonSlurper.parseText(response) - def check_version_is_new = "true" - def last_version = tags[0]["name"] - - if ( ! ( version ==~ /(\d+)\.(\d+)/ ) ) { - error "Version ${version} does not respect format: \"number.number\", please change it" - } - - - tags.each { - if ( it['name'].equalsIgnoreCase( version ) ) { - check_version_is_new = "false" - } - } - - if (check_version_is_new == "false") { - error "Pipeline aborted due to version already present in tags" - } - - List verA = version.tokenize('.') - List verB = last_version.tokenize('.') - for (int i = 0; i < 2; ++i) { - def numA = verA[i].toInteger() - def numB = verB[i].toInteger() - if (numA != numB) { - result = numA <=> numB - break - } - } - - - if ( result == -1 ) { - error "Pipeline aborted due to version ${version} being smaller than last version ${last_version}" - } - - } - } - + + if ( ${CHANGE_BRANCH} != "develop" && ${CHANGE_BRANCH} != "develop" ) { + error "Pipeline aborted due to PR not made from develop or hotfix branch" + } + + try { + sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' + } finally { + sh '''docker rm -v $BUILD_TAG-gitflow-pr''' + } + + } } ) From 3f048fae8761922cf10b1ba505719291c066a591 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 17:58:56 +0200 Subject: [PATCH 099/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 120a6b0b..e1b22294 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,7 @@ pipeline { not { environment name: 'CHANGE_ID', value: '' } - environment name: 'CHANGE_TARGET', value: 'master' + } steps { parallel( From 1c951b8903fe3fcf06cecc4fcee1a8c2dcb5d968 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:01:33 +0200 Subject: [PATCH 100/111] Update Jenkinsfile --- Jenkinsfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e1b22294..e1f08432 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,5 @@ #!groovy -import groovy.json.JsonSlurper - pipeline { agent any @@ -21,7 +19,7 @@ pipeline { not { environment name: 'CHANGE_ID', value: '' } - + environment name: 'CHANGE_TARGET', value: 'master' } steps { parallel( @@ -29,9 +27,7 @@ pipeline { "Check PR": { node(label: 'docker-1.13') { - if ( ${CHANGE_BRANCH} != "develop" && ${CHANGE_BRANCH} != "develop" ) { - error "Pipeline aborted due to PR not made from develop or hotfix branch" - } + try { sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' From bb550571c3b9d325308d409220250d751b44a6e4 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:02:22 +0200 Subject: [PATCH 101/111] Update Jenkinsfile --- Jenkinsfile | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e1f08432..35399d54 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,23 +22,14 @@ pipeline { environment name: 'CHANGE_TARGET', value: 'master' } steps { - parallel( - "Check PR": { node(label: 'docker-1.13') { - - - try { - sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' - } finally { - sh '''docker rm -v $BUILD_TAG-gitflow-pr''' - } + } } - ) } } From 4a8c966adc32652a85cc8647f173f8de70e5c744 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:03:08 +0200 Subject: [PATCH 102/111] Update Jenkinsfile --- Jenkinsfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 35399d54..18ab33d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,7 +25,15 @@ pipeline { "Check PR": { node(label: 'docker-1.13') { - + if ( ${CHANGE_BRANCH} != "develop" && ${CHANGE_BRANCH} != "hotfix" ) { + error "Pipeline aborted due to PR not made from develop or hotfix branch" + } + + try { + sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' + } finally { + sh '''docker rm -v $BUILD_TAG-gitflow-pr''' + } } From 485e15e8b79992c0977def44c7c82e6113db778a Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:05:12 +0200 Subject: [PATCH 103/111] Update Jenkinsfile --- Jenkinsfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 18ab33d1..ca1412f5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,6 +22,8 @@ pipeline { environment name: 'CHANGE_TARGET', value: 'master' } steps { + + parallel( "Check PR": { node(label: 'docker-1.13') { @@ -37,7 +39,13 @@ pipeline { } - } + }, + "Tag": { + node(label: 'docker-1.13') { + } + } + ) + } } From 2ff70107b749c10bd31e143c9383d638e33bda18 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:06:41 +0200 Subject: [PATCH 104/111] Update Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca1412f5..865387ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,12 +30,13 @@ pipeline { if ( ${CHANGE_BRANCH} != "develop" && ${CHANGE_BRANCH} != "hotfix" ) { error "Pipeline aborted due to PR not made from develop or hotfix branch" } - + script { try { sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' } finally { sh '''docker rm -v $BUILD_TAG-gitflow-pr''' } + } } From 900b2c7b9722913328bf602fe3cb8cef4cdb6904 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:07:24 +0200 Subject: [PATCH 105/111] Update Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 865387ef..e376cf0d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,7 +19,6 @@ pipeline { not { environment name: 'CHANGE_ID', value: '' } - environment name: 'CHANGE_TARGET', value: 'master' } steps { From cb6beaf96f3165dad1b8a427067766c1236cec48 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:08:00 +0200 Subject: [PATCH 106/111] Update Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e376cf0d..a5f99c4d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,6 +19,8 @@ pipeline { not { environment name: 'CHANGE_ID', value: '' } + + environment name: 'CHANGE_TARGET', value: 'master' } steps { @@ -26,9 +28,7 @@ pipeline { "Check PR": { node(label: 'docker-1.13') { - if ( ${CHANGE_BRANCH} != "develop" && ${CHANGE_BRANCH} != "hotfix" ) { - error "Pipeline aborted due to PR not made from develop or hotfix branch" - } + script { try { sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' From 305348c00d157c95a130703e428a0888686c01b2 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:10:49 +0200 Subject: [PATCH 107/111] Update Jenkinsfile --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index a5f99c4d..596197a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,6 @@ pipeline { environment name: 'CHANGE_ID', value: '' } - environment name: 'CHANGE_TARGET', value: 'master' } steps { From 0c2ac8bc05d365d5d2dfc0c62e3c5d934330cdef Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:12:13 +0200 Subject: [PATCH 108/111] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 596197a8..a5f99c4d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,6 +20,7 @@ pipeline { environment name: 'CHANGE_ID', value: '' } + environment name: 'CHANGE_TARGET', value: 'master' } steps { From 5b40e2bd147efa32aab3320eaaa07440e6a5cc11 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:16:44 +0200 Subject: [PATCH 109/111] Update Jenkinsfile --- Jenkinsfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index a5f99c4d..51127cc7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,12 @@ pipeline { node(label: 'docker-1.13') { + script { + if ( ${CHANGE_BRANCH} != "develop" && ${CHANGE_BRANCH} != "hotfix" ) { + error "Pipeline aborted due to PR not made from develop or hotfix branch" + } + try { sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' } finally { From 7c314cb62d3b982bec3828188d70bbd0ea4a73a4 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:24:25 +0200 Subject: [PATCH 110/111] Update Jenkinsfile --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 51127cc7..29384c27 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,9 +31,10 @@ pipeline { script { - if ( ${CHANGE_BRANCH} != "develop" && ${CHANGE_BRANCH} != "hotfix" ) { + + if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) { error "Pipeline aborted due to PR not made from develop or hotfix branch" - } + } try { sh '''docker run -i --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_SRC="$GIT_URL" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" gitflow''' From d1d5d00e660c993fd1f5a80e9851858f33f146c5 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 18:26:17 +0200 Subject: [PATCH 111/111] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 29384c27..f4c37ab5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -30,7 +30,7 @@ pipeline { - script { + script { if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) { error "Pipeline aborted due to PR not made from develop or hotfix branch"