Run by default vs testsuite branch v1.11.14 and with dockerhub image

italiangrid · Jan 8, 2019 · f853cbf · f853cbf
1 parent 83d83ce
commit f853cbf
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -16,6 +16,7 @@ pipeline {
     parameters {
         string(defaultValue: "omii006-vm03.cnaf.infn.it", description: '', name: 'STORM_BE_HOST')
         string(defaultValue: "omii003-vm01.cnaf.infn.it:8888", description: '', name: 'CDMI_ENDPOINT')
+        string(defaultValue: "v1.11.14", description: '', name: 'TESTSUITE_BRANCH')
         string(defaultValue: "to-be-fixed", description: '', name: 'TESTSUITE_EXCLUDE')
         string(defaultValue: "tests", description: '', name: 'TESTSUITE_SUITE')
         string(defaultValue: "/storage", description: '', name: 'STORM_STORAGE_ROOT_DIR')
@@ -31,7 +32,7 @@ pipeline {
                             usernamePassword(credentialsId: 'a5ca708a-eca8-4fc0-83cd-eb3695f083a1', passwordVariable: 'IAM_USER_PASSWORD', usernameVariable: 'IAM_USER_NAME')
                         ]) {
 
-                            def image = "${env.DOCKER_REGISTRY_HOST}/italiangrid/storm-testsuite:latest"
+                            def image = "italiangrid/storm-testsuite"
                             echo "image: ${image}"
 
                             sh "docker pull ${image}"
@@ -40,7 +41,7 @@ pipeline {
                             echo "name: ${name}"
 
                             def variables = []
-                            variables.add("-e TESTSUITE_BRANCH=${env.BRANCH_NAME}")
+                            variables.add("-e TESTSUITE_BRANCH=${params.TESTSUITE_BRANCH}")
                             variables.add("-e STORM_BE_HOST=${params.STORM_BE_HOST}")
                             variables.add("-e CDMI_ENDPOINT=${params.CDMI_ENDPOINT}")
                             variables.add("-e TESTSUITE_EXCLUDE=${params.TESTSUITE_EXCLUDE}")