From 18015204a97d710f766938bd75eacb52c7766352 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 16:58:28 +0200 Subject: [PATCH 1/4] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8956ac0..be241fbd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,7 +36,7 @@ stage('Functional tests') { node(label: 'docker-1.13') { script { try { - checkout scm + 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}/''' From 4a91d295d98e480bed1b1aa10a91f94b8887d36e Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 17:27:10 +0200 Subject: [PATCH 2/4] 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..5186d070 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.1.dev0 \ No newline at end of file +4.0 From 4301c724e1e8ac978cabb5396f7052d950046f27 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 17:30:01 +0200 Subject: [PATCH 3/4] 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 5186d070..c068b244 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -4.0 +1.4 From 2d082e2e53d1ccb787ec01c64c42391fee71f6f8 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Wed, 13 Dec 2017 17:30:35 +0200 Subject: [PATCH 4/4] 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 c068b244..7d5c902e 100644 --- a/eea/progressbar/version.txt +++ b/eea/progressbar/version.txt @@ -1 +1 @@ -1.4 +4.1