Merge pull request #70 from eea/develop

Develop

Jenkinsfile

@@ -146,6 +146,7 @@ pipeline {
                  sh '''sed -i "s|/opt/zope/src/$GIT_NAME|$(pwd)|g" coverage.xml'''
                 // run sonar scanner
                 sh "export PATH=$PATH:${scannerHome}/bin:${nodeJS}/bin; sonar-scanner -Dsonar.python.coverage.reportPaths=coverage.xml -Dsonar.sources=./ -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'''
             }
           }
         }

Products/Reportek/version.txt

@@ -1 +1 @@
-5.25
+5.26

docs/HISTORY.txt

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+5.26 - (2024-07-01)
+---------------------------
+* Change: Develop [olimpiurob]
+
 5.3 - (2024-06-27)
 ---------------------------
 * Change: Develop