Quickfix: fix url to branch repository

Pick branch name from environment variable Fix the version to 5 to match current CaaSP version. Signed-off-by: Pablo Chacin <pchacin@suse.com>
SUSE · Jun 25, 2020 · 768bbbc · 768bbbc
1 parent ed50473
commit 768bbbc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ci/jenkins/pipelines/skuba-e2e-test.Jenkinsfile b/ci/jenkins/pipelines/skuba-e2e-test.Jenkinsfile
@@ -30,7 +30,7 @@ node('caasp-team-private-integration') {
         }
 
         if (env.REPO_BRANCH != ""){
-               branch_repo = "http://download.suse.de/ibs/Devel:/CaaSP:/${repo_version}:/Branches:/${branch_name}/SLE_15_SP2"
+               branch_repo = "http://download.suse.de/ibs/Devel:/CaaSP:/5:/Branches:/${env.REPO_BRANCH}/SLE_15_SP2"
         }
     }
 }

diff --git a/ci/jenkins/templates/e2e-dev-template.yaml b/ci/jenkins/templates/e2e-dev-template.yaml
@@ -35,8 +35,8 @@
         - string:
               name: REPO_BRANCH 
               default: ''
-              description: repository branch used for skuba packages
-    pipeline-scm:
+              description: Branch of the CaaSP repository used for packages and images
+     pipeline-scm:
         scm:
             - git:
                 url: 'https://github.com/{repo-owner}/{repo-name}.git'
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,7 +30,7 @@ node('caasp-team-private-integration') { @@
             }
             if (env.REPO_BRANCH != ""){
-                   branch_repo = "http://download.suse.de/ibs/Devel:/CaaSP:/${repo_version}:/Branches:/${branch_name}/SLE_15_SP2"
+                   branch_repo = "http://download.suse.de/ibs/Devel:/CaaSP:/5:/Branches:/${env.REPO_BRANCH}/SLE_15_SP2"
             }
         }
     }
@@ Expand Down @@