Merge pull request #19 from eea/develop

Add jenkins badges

Author: alecghica

Jenkinsfile

@@ -157,7 +157,7 @@ pipeline {
                 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" -e GIT_HISTORYFILE=CHANGELOG.rst eeacms/gitflow'''
+            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" -e GIT_HISTORYFILE=$GIT_HISTORYFILE eeacms/gitflow'''
            }
           }
         }
@@ -174,7 +174,7 @@ pipeline {
       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" -e GIT_HISTORYFILE=CHANGELOG.rst eeacms/gitflow'''
+            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" -e GIT_HISTORYFILE=$GIT_HISTORYFILE eeacms/gitflow'''
           }
         }
       }

README.rst

@@ -1,5 +1,15 @@
 Eionet LDAP tools
 =================
+ 
+.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=Eionet/eea.userseditor/develop&subject=develop
+  :target: https://ci.eionet.europa.eu/job/Eionet/job/eea.userseditor/job/develop/display/redirect
+  :alt: Develop
+.. image:: https://ci.eionet.europa.eu/buildStatus/icon?job=Eionet/eea.userseditor/master&subject=master
+  :target: https://ci.eionet.europa.eu/job/Eionet/job/eea.userseditor/job/master/display/redirect
+  :alt: Master
+.. image:: https://img.shields.io/github/v/release/eea/eea.userseditor
+  :target: https://eggrepo.eea.europa.eu/d/eea.userseditor/
+  :alt: Release
 
 This package provides web forms for user interaction with the Eionet LDAP
 account system. Users can modify personal information and change their

docs/HISTORY.txt

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+2.2 - (2020-03-03)
+---------------------------
+* Change: Add jenkins badges [valentinab25]
+
 2.1 - (2020-02-26)
 ---------------------------
 * Feature: updated Jenkins pipeline

eea/userseditor/version.txt

@@ -1 +1 @@
-2.1
+2.2