[compass] fix the GS_URL for B release branch

[releng.git] / jjb / compass4nfv / compass4nfv.yml

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 1a0a6f7..5479710 100644 (file)
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -9,17 +9,17 @@
         - 'compass-daily-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-deploy-virtual-{flavor}'
-        - 'compass-deploy-bare-huawei-us'
+        - 'compass-deploy-virtual-{flavor}-{stream}'
+        - 'compass-deploy-bare-huawei-us-{stream}'
 
 # only master branch is enabled at the moment to keep no of jobs sane
     stream:
         - master:
-            branch: 'master'
+            branch: '{stream}'
             gs-pathname: ''
 #        - brahmaputra:
-#            branch: 'stable/brahmaputra'
-#            gs-pathname: '/brahmaputra'
+#            branch: 'stable/{stream}'
+#            gs-pathname: '/{stream}'
 
     flavor:
         - cluster-odl:
@@ -59,6 +59,7 @@
             branch: '{branch}'
         - compass-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
         - string:
             name: FLAVOR_CONF
             default: 'virtual_cluster'
@@ -118,6 +119,7 @@
             project: '{project}'
         - compass-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
@@ -126,25 +128,30 @@
             branch: '{branch}'
 
     triggers:
-        - timed: '@midnight'
+        - timed: 'H 16 * * *'
 
     builders:
         - trigger-builds:
-          - project: 'compass-build-iso'
+          - project: 'compass-build-iso-{stream}'
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'compass-deploy-virtual-cluster-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'compass-deploy-virtual-cluster'
+          - project: 'compass-deploy-virtual-cluster-odl-{stream}'
             git-revision: true
             block: true
-#        - trigger-builds:
-#          - project: 'compass-deploy-virtual-cluster-odl'
-#            git-revision: true
-#            block: true
         - trigger-builds:
-          - project: 'compass-deploy-virtual-cluster-onos'
+          - project: 'compass-deploy-virtual-cluster-onos-{stream}'
             git-revision: true
             block: true
+        - trigger-builds:
+          - project: 'compass-deploy-bare-huawei-us-{stream}'
+            git-revision: true
+            block: true
+
 
 - job-template:
     name: 'compass-build-iso-{stream}'
@@ -164,6 +171,7 @@
             project: '{project}'
         - compass-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
@@ -196,6 +204,7 @@
             project: '{project}'
         - compass-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
 
     scm:
         - git-scm:
@@ -210,7 +219,7 @@
         - 'builder-compass-make-ppa'
 
 - job-template:
-    name: 'compass-deploy-virtual-{flavor}'
+    name: 'compass-deploy-virtual-{flavor}-{stream}'
 
     disabled: false
 
@@ -229,6 +238,7 @@
             project: '{project}'
         - compass-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
         - string:
             name: FLAVOR_CONF
             default: '{conf}'
@@ -245,7 +255,7 @@
             fingerprint: true
 
 - job-template:
-    name: 'compass-deploy-bare-huawei-us'
+    name: 'compass-deploy-bare-huawei-us-{stream}'
 
     disabled: false
 
@@ -264,6 +274,7 @@
             project: '{project}'
         - compass-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
 
     builders:
         - 'builder-compass-ci-preclean-workspace'
@@ -300,7 +311,7 @@
             description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
         - string:
             name: GS_URL
-            default: artifacts.opnfv.org/$PROJECT/
+            default: artifacts.opnfv.org/$PROJECT{gs-pathname}
             description: "URL to Google Storage."
         - string:
             name: GS_URL_PROXY
@@ -315,6 +326,16 @@
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"
+        - choice:
+            name: COMPASS_OPENSTACK_VERSION
+            choices:
+                - 'liberty'
+                - 'juno'
+        - choice:
+            name: COMPASS_OS_VERSION
+            choices:
+                - 'trusty'
+                - 'centos7'
 
 ########################
 # builder macros
@@ -405,6 +426,8 @@
             export EXTERNAL_NIC=vnic_ci
             cd $WORKSPACE
 
+            export OS_VERSION=${COMPASS_OS_VERSION}
+            export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
             ./deploy.sh $FLAVOR_CONF
             if [ $? -ne 0 ]; then
                 echo "depolyment failed!"
@@ -416,7 +439,7 @@
             echo "Done!"
 
             ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_juno-opnfv2/ansible.log ./  &> /dev/null
+            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS_OPENSTACK_VERSION}-opnfv2/ansible.log ./  &> /dev/null
 
             exit $deploy_ret
 
@@ -439,6 +462,8 @@
 
             cd $WORKSPACE
 
+            export OS_VERSION=${COMPASS_OS_VERSION}
+            export OPENSTACK_VERSION=${COMPASS_OPENSTACK_VERSION}
             ./deploy.sh --dha $CONFDIR/dha.yml --network $CONFDIR/network.yml
             if [ $? -ne 0 ]; then
                 echo "depolyment failed!"
@@ -450,7 +475,7 @@
             echo "Done!"
 
             ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_juno-opnfv2/ansible.log ./  &> /dev/null
+            sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:/var/ansible/run/openstack_${COMPASS_OPENSTACK_VERSION}-opnfv2/ansible.log ./  &> /dev/null
 
             exit $deploy_ret