Merge "[compass4nfv] enable opencontrail ci jobs in compass"

2 files changed, 86 insertions, 34 deletions

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index ce9193cb5..40f5445dd 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -34,7 +34,8 @@
         - huawei-pod2:
             os-version: 'centos7'
             <<: *master
-        - intel-pod8:
+#        - intel-pod8:
+        - huawei-pod1:
             os-version: 'trusty'
             <<: *master
         - huawei-virtual:
@@ -44,19 +45,19 @@
     scenario:
         - 'os-nosdn-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l2-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-odl_l3-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-onos-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
         - 'os-ocl-nofeature-ha':
             disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-trigger'
+            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
         - 'compass-{scenario}-{pod}-daily-{stream}'
@@ -213,82 +214,126 @@
 # trigger macros
 ########################
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod2-master-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: ''
+
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
-        - timed: '0 3 * * * '
+        - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-master-trigger'
     triggers:
         - timed: '0 9 * * *'
+
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 15 * * *'
+        - timed: ''
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-intel-pod8-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-pod1-brahmaputra-trigger'
     triggers:
-        - timed: '0 9 * * *'
+        - timed: ''
+
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-intel-pod8-master-trigger'
+    triggers:
+        - timed: ''
+
 - trigger:
-    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 3 * * *'
 - trigger:
-    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 21 * * *'
 - trigger:
-    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: ''
 - trigger:
-    name: 'compass-os-onos-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-onos-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 15 * * *'
 - trigger:
-    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-trigger'
+    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-master-trigger'
     triggers:
         - timed: '0 9 * * *'
+- trigger:
+    name: 'compass-os-nosdn-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l2-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-odl_l3-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-onos-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'compass-os-ocl-nofeature-ha-huawei-virtual-brahmaputra-trigger'
+    triggers:
+        - timed: ''
diff --git a/jjb/compass4nfv/compass-deploy.sh b/jjb/compass4nfv/compass-deploy.sh
index 790d43b87..098cfe99d 100644
--- a/jjb/compass4nfv/compass-deploy.sh
+++ b/jjb/compass4nfv/compass-deploy.sh
@@ -24,12 +24,19 @@ echo 1 > /proc/sys/vm/drop_caches
 
 export CONFDIR=$WORKSPACE/deploy/conf
 export ISO_URL=file://$BUILD_DIRECTORY/compass.iso
+
+if [[ "${DEPLOY_SCENARIO}" =~ "-ocl" ]]
+    export NETWORK_CONF_FILE=network_ocl.yml
+else
+    export NETWORK_CONF_FILE=network.yml
+fi
+
 if [[ "$NODE_NAME" =~ "-virtual" ]]; then
-    export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/network.yml
+    export NETWORK_CONF=$CONFDIR/vm_environment/$NODE_NAME/${NETWORK_CONF_FILE}
     export DHA_CONF=$CONFDIR/vm_environment/${DEPLOY_SCENARIO}.yml
 else
     export INSTALL_NIC=eth1
-    export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/network.yml
+    export NETWORK_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${NETWORK_CONF_FILE}
     export DHA_CONF=$CONFDIR/hardware_environment/$NODE_NAME/${DEPLOY_SCENARIO}.yml
 fi