From 5644be37483ab6b9185c3a5e6a4be1eef92464fd Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Tue, 12 Dec 2017 11:21:33 +0000 Subject: [PATCH 01/12] Updated version for eea.exhibit to 8.9.dev0 --- docs/HISTORY.txt | 5 ++++- eea/exhibit/version.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 207617b..4eaa0a2 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,8 +1,11 @@ Changelog ========= -8.8.dev0 - (unreleased) +8.9.dev0 - (unreleased) ----------------------- + +8.8 - (2017-12-12) +------------------ * Change: Replace eeacms/zptlint with eeacms/plone-test:4 zptlint [avoinea refs #90415] diff --git a/eea/exhibit/version.txt b/eea/exhibit/version.txt index 3aace98..dd5bbbf 100644 --- a/eea/exhibit/version.txt +++ b/eea/exhibit/version.txt @@ -1 +1 @@ -8.8.dev0 \ No newline at end of file +8.9.dev0 \ No newline at end of file From b98e218522415eaf401a97e048d81ba8c73fd9a9 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 18 Dec 2017 19:53:20 +0200 Subject: [PATCH 02/12] [JENKINS] - Cleanup --- Jenkinsfile | 102 ++++++++++++++-------------------------------------- 1 file changed, 27 insertions(+), 75 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a7bc12e..8a2a10a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,105 +6,65 @@ pipeline { } stages { - stage('Tests') { + + stage('Code') { steps { parallel( - "WWW": { + "ZPT Lint": { node(label: 'docker-1.13') { - script { - try { - sh '''docker run -i --name="$BUILD_TAG-www" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/www-devel /debug.sh bin/test -v -vv -s $GIT_NAME''' - } finally { - sh '''docker rm -v $BUILD_TAG-www''' - } - } + sh '''docker run -i --rm --name="$BUILD_TAG-zptlint" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 zptlint''' } }, - "KGS": { + "JS Lint": { node(label: 'docker-1.13') { - script { - try { - sh '''docker run -i --name="$BUILD_TAG-kgs" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/kgs-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME''' - } finally { - sh '''docker rm -v $BUILD_TAG-kgs''' - } - } + sh '''docker run -i --rm --name="$BUILD_TAG-jslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jslint4java''' } }, - "Plone4": { + "PyFlakes": { node(label: 'docker-1.13') { - script { - try { - sh '''docker run -i --name="$BUILD_TAG-plone4" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME''' - } finally { - sh '''docker rm -v $BUILD_TAG-plone4''' - } - } + sh '''docker run -i --rm --name="$BUILD_TAG-pyflakes" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pyflakes''' + } + }, + + "i18n": { + node(label: 'docker-1.13') { + sh '''docker run -i --rm --name=$BUILD_TAG-i18n -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/i18ndude''' } } ) } } - stage('Code Analysis') { + stage('Tests') { steps { parallel( - "ZPT Lint": { - node(label: 'docker-1.13') { - script { - try { - sh '''docker run -i --name="$BUILD_TAG-zptlint" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 zptlint''' - } finally { - sh '''docker rm -v $BUILD_TAG-zptlint''' - } - } - } - }, - - "JS Lint": { + "WWW": { node(label: 'docker-1.13') { - script { - try { - sh '''docker run -i --name="$BUILD_TAG-jslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jslint4java''' - } finally { - sh '''docker rm -v $BUILD_TAG-jslint''' - } - } + sh '''docker run -i --rm --name="$BUILD_TAG-www" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/www-devel /debug.sh bin/test -v -vv -s $GIT_NAME''' } }, - "PyFlakes": { + "KGS": { node(label: 'docker-1.13') { - script { - try { - sh '''docker run -i --name="$BUILD_TAG-pyflakes" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pyflakes''' - } finally { - sh '''docker rm -v $BUILD_TAG-pyflakes''' - } - } + sh '''docker run -i --rm --name="$BUILD_TAG-kgs" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/kgs-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME''' } }, - "i18n": { + "Plone4": { node(label: 'docker-1.13') { - script { - try { - sh '''docker run -i --name=$BUILD_TAG-i18n -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/i18ndude''' - } finally { - sh '''docker rm -v $BUILD_TAG-i18n''' - } - } + sh '''docker run -i --rm --name="$BUILD_TAG-plone4" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME''' } } ) } } - stage('Code Syntax') { + + stage('Cosmetics') { steps { parallel( @@ -112,11 +72,9 @@ pipeline { node(label: 'docker-1.13') { script { try { - sh '''docker run -i --name="$BUILD_TAG-jshint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jshint''' + sh '''docker run -i --rm --name="$BUILD_TAG-jshint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jshint''' } catch (err) { echo "Unstable: ${err}" - } finally { - sh '''docker rm -v $BUILD_TAG-jshint''' } } } @@ -126,11 +84,9 @@ pipeline { node(label: 'docker-1.13') { script { try { - sh '''docker run -i --name="$BUILD_TAG-csslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/csslint''' + sh '''docker run -i --rm --name="$BUILD_TAG-csslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/csslint''' } catch (err) { echo "Unstable: ${err}" - } finally { - sh '''docker rm -v $BUILD_TAG-csslint''' } } } @@ -140,11 +96,9 @@ pipeline { node(label: 'docker-1.13') { script { try { - sh '''docker run -i --name="$BUILD_TAG-pep8" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pep8''' + sh '''docker run -i --rm --name="$BUILD_TAG-pep8" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pep8''' } catch (err) { echo "Unstable: ${err}" - } finally { - sh '''docker rm -v $BUILD_TAG-pep8''' } } } @@ -154,11 +108,9 @@ pipeline { node(label: 'docker-1.13') { script { try { - sh '''docker run -i --name="$BUILD_TAG-pylint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pylint''' + sh '''docker run -i --rm --name="$BUILD_TAG-pylint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pylint''' } catch (err) { echo "Unstable: ${err}" - } finally { - sh '''docker rm -v $BUILD_TAG-pylint''' } } } From 7093ec24d292038ae0a9cd7ca267969297cd46bd Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 18 Dec 2017 19:54:21 +0200 Subject: [PATCH 03/12] Refs #89563 - Automatize release --- Jenkinsfile | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8a2a10a..3b176a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,6 +120,41 @@ pipeline { } } + stage('Pull Request') { + when { + not { + environment name: 'CHANGE_ID', value: '' + } + environment name: 'CHANGE_TARGET', value: 'master' + } + steps { + node(label: 'docker-1.13') { + script { + if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) { + error "Pipeline aborted due to PR not made from develop or hotfix branch" + } + sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" eeacms/gitflow''' + } + } + } + } + + stage('Release') { + when { + allOf { + environment name: 'CHANGE_ID', value: '' + branch 'master' + } + } + steps { + node(label: 'docker-1.13') { + withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) { + sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow''' + } + } + } + } + } post { From 189bce88c4d007cfe22ab328e49707fa9c6ff1f3 Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Thu, 18 Jan 2018 12:37:16 +0100 Subject: [PATCH 04/12] Added egg release to pypi - Refs #91780 --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3b176a8..d6a92e9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -133,7 +133,7 @@ pipeline { if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) { error "Pipeline aborted due to PR not made from develop or hotfix branch" } - sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_HISTORYFILE="$GIT_HISTORYFILE" -e GIT_NAME="$GIT_NAME" eeacms/gitflow''' + sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow''' } } } @@ -148,8 +148,8 @@ pipeline { } steps { node(label: 'docker-1.13') { - withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) { - sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME" -e GIT_VERSIONFILE="$GIT_VERSIONFILE" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow''' + withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),[$class: 'UsernamePasswordMultiBinding', credentialsId: 'pypi-jenkins', usernameVariable: 'PYPI_USERNAME', passwordVariable: 'PYPI_PASSWORD']]) { + sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME" -e PYPI_USERNAME="$PYPI_USERNAME" -e PYPI_PASSWORD="$PYPI_PASSWORD" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow''' } } } From ea3205fcc971a59e718dd8f849b2531dee53b7de Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Fri, 23 Mar 2018 16:50:58 +0200 Subject: [PATCH 05/12] [JENKINS] - Jenkinsfile update where Docker jobs run --- Jenkinsfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d6a92e9..bd3b334 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,25 +12,25 @@ pipeline { parallel( "ZPT Lint": { - node(label: 'docker-1.13') { + node(label: 'docker') { sh '''docker run -i --rm --name="$BUILD_TAG-zptlint" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 zptlint''' } }, "JS Lint": { - node(label: 'docker-1.13') { + node(label: 'docker') { sh '''docker run -i --rm --name="$BUILD_TAG-jslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jslint4java''' } }, "PyFlakes": { - node(label: 'docker-1.13') { + node(label: 'docker') { sh '''docker run -i --rm --name="$BUILD_TAG-pyflakes" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pyflakes''' } }, "i18n": { - node(label: 'docker-1.13') { + node(label: 'docker') { sh '''docker run -i --rm --name=$BUILD_TAG-i18n -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/i18ndude''' } } @@ -43,19 +43,19 @@ pipeline { parallel( "WWW": { - node(label: 'docker-1.13') { + node(label: 'docker') { sh '''docker run -i --rm --name="$BUILD_TAG-www" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/www-devel /debug.sh bin/test -v -vv -s $GIT_NAME''' } }, "KGS": { - node(label: 'docker-1.13') { + node(label: 'docker') { sh '''docker run -i --rm --name="$BUILD_TAG-kgs" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/kgs-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME''' } }, "Plone4": { - node(label: 'docker-1.13') { + node(label: 'docker') { sh '''docker run -i --rm --name="$BUILD_TAG-plone4" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME''' } } @@ -69,7 +69,7 @@ pipeline { parallel( "JS Hint": { - node(label: 'docker-1.13') { + node(label: 'docker') { script { try { sh '''docker run -i --rm --name="$BUILD_TAG-jshint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/jshint''' @@ -81,7 +81,7 @@ pipeline { }, "CSS Lint": { - node(label: 'docker-1.13') { + node(label: 'docker') { script { try { sh '''docker run -i --rm --name="$BUILD_TAG-csslint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/csslint''' @@ -93,7 +93,7 @@ pipeline { }, "PEP8": { - node(label: 'docker-1.13') { + node(label: 'docker') { script { try { sh '''docker run -i --rm --name="$BUILD_TAG-pep8" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pep8''' @@ -105,7 +105,7 @@ pipeline { }, "PyLint": { - node(label: 'docker-1.13') { + node(label: 'docker') { script { try { sh '''docker run -i --rm --name="$BUILD_TAG-pylint" -e GIT_SRC="https://github.com/eea/$GIT_NAME.git" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/pylint''' @@ -128,7 +128,7 @@ pipeline { environment name: 'CHANGE_TARGET', value: 'master' } steps { - node(label: 'docker-1.13') { + node(label: 'docker') { script { if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) { error "Pipeline aborted due to PR not made from develop or hotfix branch" @@ -147,7 +147,7 @@ pipeline { } } steps { - node(label: 'docker-1.13') { + node(label: 'docker') { withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'eea-jenkins', usernameVariable: 'EGGREPO_USERNAME', passwordVariable: 'EGGREPO_PASSWORD'],string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN'),[$class: 'UsernamePasswordMultiBinding', credentialsId: 'pypi-jenkins', usernameVariable: 'PYPI_USERNAME', passwordVariable: 'PYPI_PASSWORD']]) { sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-master" -e GIT_BRANCH="$BRANCH_NAME" -e EGGREPO_USERNAME="$EGGREPO_USERNAME" -e EGGREPO_PASSWORD="$EGGREPO_PASSWORD" -e GIT_NAME="$GIT_NAME" -e PYPI_USERNAME="$PYPI_USERNAME" -e PYPI_PASSWORD="$PYPI_PASSWORD" -e GIT_ORG="$GIT_ORG" -e GIT_TOKEN="$GITHUB_TOKEN" eeacms/gitflow''' } From 381250b0aae2452b692dedf0bc183ea499364b6c Mon Sep 17 00:00:00 2001 From: valentinab25 Date: Tue, 3 Apr 2018 10:52:42 +0200 Subject: [PATCH 06/12] Jenkinsfile new vars for gitflow - Refs #89957 --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bd3b334..d594700 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -133,7 +133,9 @@ pipeline { if ( env.CHANGE_BRANCH != "develop" && !( env.CHANGE_BRANCH.startsWith("hotfix")) ) { error "Pipeline aborted due to PR not made from develop or hotfix branch" } - sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow''' + withCredentials([string(credentialsId: 'eea-jenkins-token', variable: 'GITHUB_TOKEN')]) { + sh '''docker run -i --rm --name="$BUILD_TAG-gitflow-pr" -e GIT_CHANGE_BRANCH="$CHANGE_BRANCH" -e GIT_CHANGE_AUTHOR="$CHANGE_AUTHOR" -e GIT_CHANGE_TITLE="$CHANGE_TITLE" -e GIT_TOKEN="$GITHUB_TOKEN" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" -e GIT_ORG="$GIT_ORG" -e GIT_NAME="$GIT_NAME" eeacms/gitflow''' + } } } } From 32567060e242760f87751e955130aa69c581fe20 Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Fri, 13 Apr 2018 18:23:40 +0300 Subject: [PATCH 07/12] [JENKINS] - Update Jenkins build status badge --- README.rst | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index f938f30..ff79529 100644 --- a/README.rst +++ b/README.rst @@ -1,8 +1,12 @@ =========== EEA Exhibit =========== -.. image:: http://ci.eionet.europa.eu/job/eea/job/eea.exhibit/job/master/badge/icon - :target: http://ci.eionet.europa.eu/job/eea/job/eea.exhibit/job/master/display/redirect +.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=eea/eea.exhibit/develop + :target: https://ci.eionet.europa.eu/job/eea/job/eea.exhibit/job/develop/display/redirect + :alt: Develop +.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=eea/eea.exhibit/master + :target: https://ci.eionet.europa.eu/job/eea/job/eea.exhibit/job/master/display/redirect + :alt: Master EEA Exhibit provides Simile Widgets Exhibit framework integration for eea.app.visualization. See eea.daviz package for more details. From 7be1ba50cdf28baf35434b0f259015274b28c17a Mon Sep 17 00:00:00 2001 From: Alexandru Ghica Date: Wed, 20 Jun 2018 12:55:48 +0000 Subject: [PATCH 08/12] updated URLs pointing to eea.europa.eu with https://, refs #95849 --- CONTRIBUTING.md | 2 +- README.rst | 12 ++++++------ docs/HISTORY.txt | 2 ++ eea/exhibit/README.txt | 8 ++++---- .../exhibit/2.2.0/api/extensions/curate/readme.txt | 2 +- setup.py | 4 ++-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e64925f..6e35755 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -46,4 +46,4 @@ official issue register. * [General GitHub documentation](http://help.github.com/) * [GitHub pull request documentation](http://help.github.com/send-pull-requests/) -* [EEA packages](http://eea.github.io/docs/IT-systems/) +* [EEA packages](https://eea.github.io/docs/IT-systems/) diff --git a/README.rst b/README.rst index ff79529..0a5b8c4 100644 --- a/README.rst +++ b/README.rst @@ -12,7 +12,7 @@ EEA Exhibit provides Simile Widgets Exhibit framework integration for eea.app.visualization. See eea.daviz package for more details. -.. image:: http://eea.github.com/_images/eea.daviz.layers.svg +.. image:: https://eea.github.io/_images/eea.daviz.layers.svg .. contents:: @@ -65,7 +65,7 @@ Dependencies - `eea.app.visualization`_ -.. image:: http://eea.github.com/_images/eea.daviz.dependencies.svg +.. image:: https://eea.github.io/_images/eea.daviz.dependencies.svg Source code @@ -98,7 +98,7 @@ Funding EEA_ - European Environment Agency (EU) -.. _EEA: http://www.eea.europa.eu/ -.. _`eea.app.visualization`: http://eea.github.com/docs/eea.app.visualization -.. _`plone.recipe.zope2instance`: http://pypi.python.org/pypi/plone.recipe.zope2instance -.. _`zc.buildout`: http://pypi.python.org/pypi/zc.buildout +.. _EEA: https://www.eea.europa.eu/ +.. _`eea.app.visualization`: https://eea.github.com/docs/eea.app.visualization +.. _`plone.recipe.zope2instance`: https://pypi.python.org/pypi/plone.recipe.zope2instance +.. _`zc.buildout`: https://pypi.python.org/pypi/zc.buildout diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 4eaa0a2..2d07b74 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -3,6 +3,8 @@ Changelog 8.9.dev0 - (unreleased) ----------------------- +* Change: updated URLs pointing to eea.europa.eu with https:// + [alecghica refs #95849] 8.8 - (2017-12-12) ------------------ diff --git a/eea/exhibit/README.txt b/eea/exhibit/README.txt index d7349bf..bffeac8 100644 --- a/eea/exhibit/README.txt +++ b/eea/exhibit/README.txt @@ -26,7 +26,7 @@ Authors EEA_ - European Environment Agency (EU) -.. _EEA: http://www.eea.europa.eu/ -.. _`EEA Exhibit`: http://eea.github.com/docs/eea.exhibit -.. _`eea.app.visualization`: http://eea.github.com/docs/eea.app.visualization -.. _`eea.daviz`: http://eea.github.com/docs/eea.daviz +.. _EEA: https://www.eea.europa.eu/ +.. _`EEA Exhibit`: https://eea.github.io/docs/eea.exhibit +.. _`eea.app.visualization`: https://eea.github.io/docs/eea.app.visualization +.. _`eea.daviz`: https://eea.github.io/docs/eea.daviz diff --git a/eea/exhibit/simile/exhibit/2.2.0/api/extensions/curate/readme.txt b/eea/exhibit/simile/exhibit/2.2.0/api/extensions/curate/readme.txt index 447631b..65f18a6 100644 --- a/eea/exhibit/simile/exhibit/2.2.0/api/extensions/curate/readme.txt +++ b/eea/exhibit/simile/exhibit/2.2.0/api/extensions/curate/readme.txt @@ -13,4 +13,4 @@ Dependencies: - ElementTree: http://effbot.org/zone/element-index.htm - GData Python Client: http://code.google.com/p/gdata-python-client/ - - simplejson: http://pypi.python.org/pypi/simplejson + - simplejson: https://pypi.python.org/pypi/simplejson diff --git a/setup.py b/setup.py index 3823c43..dff6799 100644 --- a/setup.py +++ b/setup.py @@ -15,7 +15,7 @@ "resources."), long_description=open("README.rst").read() + "\n" + open(os.path.join("docs", "HISTORY.txt")).read(), - # http://pypi.python.org/pypi?%3Aaction=list_classifiers + # https://pypi.python.org/pypi?%3Aaction=list_classifiers classifiers=[ "Framework :: Zope2", "Framework :: Plone", @@ -32,7 +32,7 @@ keywords='EEA Add-ons Plone Zope', author='European Environment Agency: IDM2 A-Team', author_email='eea-edw-a-team-alerts@googlegroups.com', - download_url="http://pypi.python.org/pypi/eea.exhibit", + download_url="https://pypi.python.org/pypi/eea.exhibit", url='https://github.com/collective/eea.exhibit', license='GPL', packages=find_packages(exclude=['ez_setup']), From 99e9334e8237f702c3c6b7640a6d9f54b47d3091 Mon Sep 17 00:00:00 2001 From: Alexandru Ghica Date: Wed, 20 Jun 2018 15:15:47 +0000 Subject: [PATCH 09/12] removed svn link --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 0a5b8c4..546d26f 100644 --- a/README.rst +++ b/README.rst @@ -76,7 +76,7 @@ Latest source code (Zope 2 compatible): - `EEA on Github `_ Plone 2 and 3 compatible: - https://svn.eionet.europa.eu/repositories/Zope/trunk/eea.exhibit/branches/plone25 + https://github.com/eea/eea.exhibit/tree/plone25 Copyright and license From 45897761063edc1cb57ae429db8d009fd2b5c687 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 7 Sep 2018 18:43:16 +0300 Subject: [PATCH 10/12] Updated version to 8.9 --- eea/exhibit/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/exhibit/version.txt b/eea/exhibit/version.txt index dd5bbbf..fa97ece 100644 --- a/eea/exhibit/version.txt +++ b/eea/exhibit/version.txt @@ -1 +1 @@ -8.9.dev0 \ No newline at end of file +8.9 From 55ab652992d6b6949ecb7dac429535b98f5e04c0 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Fri, 7 Sep 2018 18:47:31 +0300 Subject: [PATCH 11/12] Updated changelog - removed develop information --- docs/HISTORY.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 2d07b74..b195835 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,7 +1,7 @@ Changelog ========= -8.9.dev0 - (unreleased) +8.9 - (2018-09-07) ----------------------- * Change: updated URLs pointing to eea.europa.eu with https:// [alecghica refs #95849] @@ -167,7 +167,7 @@ Changelog * Feature: Made this package Plone independent (Zope2 minimal requirements) [voineali refs #5421] -4.5-dev - (unreleased) +4.5 - (2018-09-07) ---------------------- 4.4 - (2012-07-13) From abbd85b463ee276f50ff41f20783cb038e9840dd Mon Sep 17 00:00:00 2001 From: Alin Voinea Date: Mon, 10 Sep 2018 15:29:36 +0300 Subject: [PATCH 12/12] [JENKINS] - Remove KGS tests --- Jenkinsfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d594700..850293f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -48,12 +48,6 @@ pipeline { } }, - "KGS": { - node(label: 'docker') { - sh '''docker run -i --rm --name="$BUILD_TAG-kgs" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/kgs-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME''' - } - }, - "Plone4": { node(label: 'docker') { sh '''docker run -i --rm --name="$BUILD_TAG-plone4" -e GIT_BRANCH="$BRANCH_NAME" -e ADDONS="$GIT_NAME" -e DEVELOP="src/$GIT_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plone-test:4 -v -vv -s $GIT_NAME'''