Merge "[compass] fix concurrency issues of ci jobs"

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index d2dc1d1..2ebd775 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -176,7 +176,7 @@
 
             mkdir -p upload
             mv docs_output "$local_path"
-            gsutil -m cp -r "$local_path" "gs://$GS_URL"
+            gsutil -m cp -r "$local_path" "gs://$gs_path"
 
             gsutil -m setmeta \
                 -h "Content-Type:text/html" \

diff --git a/jjb/vswitchperf/vswitchperf.yml b/jjb/vswitchperf/vswitchperf.yml
index 233cf08..3f7f6bf 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yml
+++ b/jjb/vswitchperf/vswitchperf.yml
@@ -14,10 +14,12 @@
             branch: '{stream}'
             gs-pathname: ''
             disabled: false
+            slave-label: 'opnfv-build-ubuntu'
         - colorado:
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
             disabled: false
+            slave-label: 'intel-pod3'
 
 - job-template:
 
@@ -72,7 +74,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm:
@@ -134,7 +136,7 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+        - '{slave-label}-defaults'
 
     scm:
         - gerrit-trigger-scm: