Use internal debian image, improve branch-based versioning

Author: tsimionescu

jenkins/JenkinsFile

@@ -26,7 +26,7 @@ def projectProperties = [
     pipelineTriggers(pipeline_triggers),
     [$class: 'BuildDiscarderProperty',strategy: [$class: 'LogRotator', numToKeepStr: '50']],
     parameters ([
-        string(name:'BASE_IMAGE', defaultValue:'debian:12-slim', description: 'eg. 1.0.0.1757'),
+        string(name:'BASE_IMAGE', defaultValue:'docker-virtual-wap.artifactorylbj.it.keysight.com/wap-base-debian:12.8-slim', description: 'docker-virtual-wap.artifactorylbj.it.keysight.com/wap-base-debian:12.8-slim'),
         booleanParam(name:'publish_pypi', defaultValue:false, description: 'If true, the build will be published to the public PyPI repos. Only works on release/ branches.')
     ]),
 ]
@@ -37,20 +37,23 @@ def do_publish = params.publish_pypi
 
 @NonCPS
 boolean setDisplayVersion(publish) {
+    branch_sanitized = branch.replaceAll('-', '.').replaceAll('_', '.')
     def matcher = Pattern.compile("^release%2F([0-9]+)\\.([0-9]+)\$").matcher(branch)
     if (matcher.matches()) {
-        build_number = "dev${env.BUILD_NUMBER}"
+        build_number = "dev${env.BUILD_NUMBER}+${branch_sanitized}"
         if (publish) {
             build_number = "${env.BUILD_NUMBER}"
         }
-	env.VERSION = "${matcher.group(1).toString()}.${matcher.group(2).toString()}.${build_number}"
+	env.PIP_VERSION = "${matcher.group(1).toString()}.${matcher.group(2).toString()}.${build_number}"
+        env.DOCKER_VERSION = env.PIP_VERSION.replaceAll('\\+', '-')
     } else if (branch.startsWith("release%2F")) {
         throw new Exception("Unexpected release branch format ${branch}, expected 'release%2fNUMBER.NUMBER'")
     } else {
-        env.VERSION = "0.0.dev${env.BUILD_NUMBER}"
+        env.PIP_VERSION = "0.0.dev${env.BUILD_NUMBER}+${branch_sanitized}"
+        env.DOCKER_VERSION = env.PIP_VERSION.replaceAll('\\+', '-')
         publish = false
     }
-    currentBuild.displayName = env.VERSION
+    currentBuild.displayName = env.PIP_VERSION
     return publish
 }
 
@@ -71,15 +74,15 @@ node('wap') {
             sh('''
                   docker build -f docker/Dockerfile \
                                --build-arg base_image="$BASE_IMAGE" \
-                               --build-arg VERSION="$VERSION" \
-                               -t cyperf-api-wrapper-build:$VERSION \
+                               --build-arg VERSION="$PIP_VERSION" \
+                               -t cyperf-api-wrapper-build:$DOCKER_VERSION \
                                .
                 ''')
         }
         stage('Run tests') {
             sh('''
                   docker run --rm \
-                             cyperf-api-wrapper-build:$VERSION \
+                             cyperf-api-wrapper-build:$DOCKER_VERSION \
                              /cyperf-api-wrapper-build/test.sh /build/py3
                 ''')
         }
@@ -92,7 +95,7 @@ node('wap') {
                         docker run --rm \
                                    --env TWINE_USERNAME="$ARTIFACTORY_USERNAME" \
                                    --env TWINE_PASSWORD="$ARTIFACTORY_PASSWORD" \
-                                   cyperf-api-wrapper-build:$VERSION \
+                                   cyperf-api-wrapper-build:$DOCKER_VERSION \
                                    /cyperf-api-wrapper-build/publish.sh /build/py3 "--repository artifactory"
                     ''')
             }
@@ -106,15 +109,15 @@ node('wap') {
                            docker run --rm \
                                       --env TWINE_USERNAME="__token__" \
                                       --env TWINE_PASSWORD="$PYPI_API_TOKEN" \
-                                      cyperf-api-wrapper-build:$VERSION \
+                                      cyperf-api-wrapper-build:$DOCKER_VERSION \
                                       /cyperf-api-wrapper-build/publish.sh /build/py3
                     ''')
                 }
             }
         }
         stage('Cleanup') {
             sh('''
-                   docker rmi cyperf-api-wrapper-build:$VERSION
+                   docker rmi cyperf-api-wrapper-build:$DOCKER_VERSION
                 ''')
         }
     }