Merge "modify the parameter of PPA_REPO"

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 9b13e69..f962518 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -12,10 +12,12 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
+            ppa-pathname: '/{stream}'
             disabled: false
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            ppa-pathname: '/{stream}'
             disabled: false
 
     jobs:
@@ -47,6 +49,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+            ppa-pathname: '{ppa-pathname}'
         - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
@@ -90,6 +93,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+            ppa-pathname: '{ppa-pathname}'
         - '{node}-defaults'
         - '{installer}-defaults'
     scm:
@@ -121,7 +125,7 @@
             description: "URL to Google Storage."
         - string:
             name: PPA_REPO
-            default: "http://205.177.226.237:9999{gs-pathname}"
+            default: "http://205.177.226.237:9999{ppa-pathname}"
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index e625c68..14279e6 100644 (file)
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -11,10 +11,12 @@
         - master:
             branch: '{stream}'
             gs-pathname: ''
+            ppa-pathname: '/{stream}'
             disabled: false
         - danube:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
+            ppa-pathname: '/{stream}'
             disabled: false
 
     distro:
@@ -111,6 +113,7 @@
         - 'compass-verify-defaults':
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+            ppa-pathname: '{ppa-pathname}'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
@@ -229,6 +232,7 @@
         - 'compass-verify-defaults':
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
+            ppa-pathname: '{ppa-pathname}'
         - string:
             name: DEPLOY_SCENARIO
             default: 'k8-nosdn-nofeature-ha'
@@ -335,7 +339,7 @@
             description: "URL to Google Storage."
         - string:
             name: PPA_REPO
-            default: "http://205.177.226.237:9999{gs-pathname}"
+            default: "http://205.177.226.237:9999{ppa-pathname}"
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"