Merge pull request #7 from eea/develop

Develop #98283
eea · Sep 10, 2018 · 568c98b · 568c98b
2 parents 3bad175 + abbd85b
commit 568c98b
Show file tree

Hide file tree

Showing 8 changed files with 100 additions and 108 deletions.
diff --git 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/Jenkinsfile b/Jenkinsfile
@@ -6,159 +6,105 @@ pipeline {
     }
 
   stages {
-    stage('Tests') {
+
+    stage('Code') {
       steps {
         parallel(
 
-          "WWW": {
-            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'''
-                }
-              }
+          "ZPT Lint": {
+            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'''
             }
           },
 
-          "KGS": {
-            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'''
-                }
-              }
+          "JS Lint": {
+            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'''
             }
           },
 
-          "Plone4": {
-            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'''
-                }
-              }
+          "PyFlakes": {
+            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') {
+              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": {
-            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'''
-                }
-              }
-            }
-          },
-
-          "PyFlakes": {
-            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'''
-                }
-              }
+          "WWW": {
+            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'''
             }
           },
 
-          "i18n": {
-            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'''
-                }
-              }
+          "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'''
             }
           }
         )
       }
     }
 
-    stage('Code Syntax') {
+
+    stage('Cosmetics') {
       steps {
         parallel(
 
           "JS Hint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               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'''
                 }
               }
             }
           },
 
           "CSS Lint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               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'''
                 }
               }
             }
           },
 
           "PEP8": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               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'''
                 }
               }
             }
           },
 
           "PyLint": {
-            node(label: 'docker-1.13') {
+            node(label: 'docker') {
               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'''
                 }
               }
             }
@@ -168,6 +114,43 @@ pipeline {
       }
     }
 
+    stage('Pull Request') {
+      when {
+        not {
+          environment name: 'CHANGE_ID', value: ''
+        }
+        environment name: 'CHANGE_TARGET', value: 'master'
+      }
+      steps {
+        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"
+            }
+           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'''
+           }
+          }
+        }
+      }
+    }
+
+    stage('Release') {
+      when {
+        allOf {
+          environment name: 'CHANGE_ID', value: ''
+          branch 'master'
+        }
+      }
+      steps {
+        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'''
+          }
+        }
+      }
+    }
+
   }
 
   post {

diff --git a/README.rst b/README.rst
@@ -1,14 +1,18 @@
 ===========
 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.
 
 
-.. image:: http://eea.github.com/_images/eea.daviz.layers.svg
+.. image:: https://eea.github.io/_images/eea.daviz.layers.svg
 
 
 .. contents::
@@ -61,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
@@ -72,7 +76,7 @@ Latest source code (Zope 2 compatible):
 - `EEA on Github <https://github.com/eea/eea.exhibit>`_
 
 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
@@ -94,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
@@ -1,8 +1,13 @@
 Changelog
 =========
 
-8.8.dev0 - (unreleased)
+8.9 - (2018-09-07)
 -----------------------
+* Change: updated URLs pointing to eea.europa.eu with https://
+  [alecghica refs #95849]
+
+8.8 - (2017-12-12)
+------------------
 * Change: Replace eeacms/zptlint with eeacms/plone-test:4 zptlint
   [avoinea refs #90415]
 
@@ -162,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)

diff --git 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
@@ -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/eea/exhibit/version.txt b/eea/exhibit/version.txt
@@ -1 +1 @@
-8.8.dev0
+8.9
diff --git 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='[email protected]',
-      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']),