From 3426580aa4d8d815a2e256d8bc42766bd1b3becc Mon Sep 17 00:00:00 2001 From: EEA Jenkins <2368628+eea-jenkins@users.noreply.github.com> Date: Thu, 8 Apr 2021 18:49:58 +0300 Subject: [PATCH 1/6] Back to devel --- docs/HISTORY.txt | 3 +++ eea/usersdb/version.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 4d2cb3a..8bac486 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,6 +1,9 @@ Changelog ========= +2.7-dev0 - (unreleased) +--------------------------- + 2.6 - (2021-04-08) --------------------------- * add email validation (replacing validate_email package) [dumitval] diff --git a/eea/usersdb/version.txt b/eea/usersdb/version.txt index 5154b3f..4597ef8 100644 --- a/eea/usersdb/version.txt +++ b/eea/usersdb/version.txt @@ -1 +1 @@ -2.6 +2.7-dev0 From 79c70d8a1e25722ff0439a4561cfd678999a0a49 Mon Sep 17 00:00:00 2001 From: valentinab25 <30239069+valentinab25@users.noreply.github.com> Date: Thu, 6 May 2021 20:39:48 +0300 Subject: [PATCH 2/6] add code coverage --- Jenkinsfile | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8901580..6d0ab31 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -87,14 +87,24 @@ pipeline { "PloneSaaS": { node(label: 'docker') { - sh '''docker run -i --rm --name="$BUILD_TAG-plonesaas" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plonesaas-devel /debug.sh bin/test --test-path /plone/instance/src/$GIT_NAME -v -vv -s $GIT_NAME''' + script { + try { + sh '''docker pull eeacms/plonesaas-devel; docker run -i --name="$BUILD_TAG-plonesaas" -e GIT_NAME="$GIT_NAME" -e GIT_BRANCH="$BRANCH_NAME" -e GIT_CHANGE_ID="$CHANGE_ID" eeacms/plonesaas-devel /debug.sh coverage''' + sh '''mkdir -p xunit-reports; docker cp $BUILD_TAG-plonesaas:/plone/instance/parts/xmltestreport/testreports/. xunit-reports/''' + stash name: "xunit-reports", includes: "xunit-reports/*.xml" + sh '''docker cp $BUILD_TAG-plonesaas:/plone/instance/src/$GIT_NAME/coverage.xml coverage.xml''' + stash name: "coverage.xml", includes: "coverage.xml" + } finally { + sh '''docker rm -v $BUILD_TAG-plonesaas''' + } + junit 'xunit-reports/*.xml' + } } - } + }, ) } } - stage('Report to SonarQube') { when { allOf { @@ -105,10 +115,15 @@ pipeline { node(label: 'swarm') { script{ checkout scm + dir("xunit-reports") { + unstash "xunit-reports" + } + unstash "coverage.xml" def scannerHome = tool 'SonarQubeScanner'; def nodeJS = tool 'NodeJS11'; withSonarQubeEnv('Sonarqube') { - sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPath=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER" + sh '''sed -i "s|/plone/instance/src/$GIT_NAME|$(pwd)|g" coverage.xml''' + sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.xunit.skipDetails=true -Dsonar.python.xunit.reportPath=xunit-reports/*.xml -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.sources=./eea -Dsonar.projectKey=$GIT_NAME-$BRANCH_NAME -Dsonar.projectVersion=$BRANCH_NAME-$BUILD_NUMBER" sh '''try=2; while [ \$try -gt 0 ]; do curl -s -XPOST -u "${SONAR_AUTH_TOKEN}:" "${SONAR_HOST_URL}api/project_tags/set?project=${GIT_NAME}-${BRANCH_NAME}&tags=${SONARQUBE_TAGS},${BRANCH_NAME}" > set_tags_result; if [ \$(grep -ic error set_tags_result ) -eq 0 ]; then try=0; else cat set_tags_result; echo "... Will retry"; sleep 60; try=\$(( \$try - 1 )); fi; done''' } } @@ -116,6 +131,7 @@ pipeline { } } + stage('Pull Request') { when { not { From 78cd4df6c1e2c73395646e2dba905ab6b0297a63 Mon Sep 17 00:00:00 2001 From: Valentin Dumitru Date: Mon, 22 Nov 2021 18:43:39 +0200 Subject: [PATCH 3/6] allow digits in role_id filtering --- docs/HISTORY.txt | 2 ++ eea/usersdb/db_agent.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 8bac486..64ada39 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -3,6 +3,8 @@ Changelog 2.7-dev0 - (unreleased) --------------------------- +* allow digits in role_id filtering + [valipod] 2.6 - (2021-04-08) --------------------------- diff --git a/eea/usersdb/db_agent.py b/eea/usersdb/db_agent.py index 97c19de..d69a440 100644 --- a/eea/usersdb/db_agent.py +++ b/eea/usersdb/db_agent.py @@ -531,7 +531,7 @@ def filter_roles( pattern = pattern.lower() for ch in pattern: - if ch not in ascii_lowercase + '-*': + if ch not in ascii_lowercase + digits + '-*': return set() if not pattern: From 1a72bf0323867e2cef6a1a891d584c901a503c4c Mon Sep 17 00:00:00 2001 From: Valentin Dumitru Date: Mon, 22 Nov 2021 18:56:19 +0200 Subject: [PATCH 4/6] pylint fixes --- eea/usersdb/tests/test_db_agent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/usersdb/tests/test_db_agent.py b/eea/usersdb/tests/test_db_agent.py index 9ec7c1b..62da632 100644 --- a/eea/usersdb/tests/test_db_agent.py +++ b/eea/usersdb/tests/test_db_agent.py @@ -5,9 +5,9 @@ import unittest from copy import deepcopy -from mock import Mock import six from six.moves import map +from mock import Mock import ldap from eea.usersdb import db_agent from eea.usersdb.tests.mock_recorder import Recorder From 32dbe6d90ab42bec7113016d6e8f0f3bbe711070 Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Mon, 22 Nov 2021 19:05:38 +0200 Subject: [PATCH 5/6] Updated version to 2.7 --- eea/usersdb/version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eea/usersdb/version.txt b/eea/usersdb/version.txt index 4597ef8..1effb00 100644 --- a/eea/usersdb/version.txt +++ b/eea/usersdb/version.txt @@ -1 +1 @@ -2.7-dev0 +2.7 From b78adb35c196001364d0d361b08c887488d457de Mon Sep 17 00:00:00 2001 From: EEA Jenkins Date: Mon, 22 Nov 2021 19:06:04 +0200 Subject: [PATCH 6/6] Updated changelog - removed develop information --- docs/HISTORY.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/HISTORY.txt b/docs/HISTORY.txt index 64ada39..faaf5e0 100644 --- a/docs/HISTORY.txt +++ b/docs/HISTORY.txt @@ -1,7 +1,7 @@ Changelog ========= -2.7-dev0 - (unreleased) +2.7 - (2021-11-22) --------------------------- * allow digits in role_id filtering [valipod]