X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass4nfv.yml;h=f1bcee757f95a9b45388560eb2427e9e09484971;hb=bb7d4a0e02785c5663695a3424d2ff4dd258da82;hp=1a0a6f74666334cd8d99a1cb9347362449001695;hpb=4106697e71c5414f2f538722733ac35926b18514;p=releng.git

diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml
index 1a0a6f746..f1bcee757 100644
--- a/jjb/compass4nfv/compass4nfv.yml
+++ b/jjb/compass4nfv/compass4nfv.yml
@@ -126,25 +126,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'
             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-odl'
+            git-revision: true
+            block: true
         - trigger-builds:
           - project: 'compass-deploy-virtual-cluster-onos'
             git-revision: true
             block: true
+        - trigger-builds:
+          - project: 'compass-deploy-bare-huawei-us'
+            git-revision: true
+            block: true
+
 
 - job-template:
     name: 'compass-build-iso-{stream}'
@@ -315,6 +320,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 +420,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 +433,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 +456,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 +469,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