Merge "add pod related unittests in testAPI"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 18 May 2016 12:27:46 +0000 (12:27 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 18 May 2016 12:27:46 +0000 (12:27 +0000)
jjb/fuel/fuel-ci-jobs.yml
jjb/fuel/fuel-deploy.sh
jjb/functest/functest-ci-jobs.yml
utils/test/result_collection_api/run_test.sh [changed mode: 0644->0755]

index 77b711e..acfceda 100644 (file)
@@ -43,6 +43,8 @@
             <<: *master
         - virtual:
             <<: *master
+        - zte-pod1:
+            <<: *master
 #--------------------------------
 #       scenarios
 #--------------------------------
     name: 'fuel-os-nosdn-kvm-noha-ericsson-pod2-brahmaputra-trigger'
     triggers:
         - timed: ''
+
+#-----------------------------------------------
+# ZTE POD1 Triggers running against master branch
+#-----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-nofeature-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: '0 12 * * *'
+- trigger:
+    name: 'fuel-os-odl_l3-nofeature-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-onos-nofeature-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-bgpvpn-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-odl_l2-sfc-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-kvm-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: ''
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-zte-pod1-master-trigger'
+    triggers:
+        - timed: ''
 #-----------------------------------------------
 # Triggers for other PODs
 #-----------------------------------------------
index bab6151..ceccc54 100755 (executable)
@@ -43,8 +43,8 @@ if [[ "$NODE_NAME" =~ "virtual" ]]; then
     POD_NAME="virtual_kvm"
 fi
 
-# we currently support ericsson, intel, and lf labs
-if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf) ]]; then
+# we currently support ericsson, intel, lf and zte labs
+if [[ ! "$LAB_NAME" =~ (ericsson|intel|lf|zte) ]]; then
     echo "Unsupported/unidentified lab $LAB_NAME. Cannot continue!"
     exit 1
 else
index 6cfcfdc..cd3f11e 100644 (file)
     builders:
         - 'functest-cleanup'
         - 'set-functest-env'
-        - 'functest-all'
+        - 'functest-daily'
         - 'functest-store-results'
 
 - builder:
     name: functest-suite-builder
+    builders:
+        - 'functest-cleanup'
+        - 'set-functest-env'
+        - 'functest-suite'
+
+
+- builder:
+    name: functest-suite
     builders:
         - shell: |
             #!/bin/bash
             container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
             docker exec $container_id $cmd
 
+
 - builder:
-    name: functest-all
+    name: functest-daily
     builders:
         - shell: |
             #!/bin/bash
old mode 100644 (file)
new mode 100755 (executable)