X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=8fe3659583f2b41ee1689febcb6bd15fdb786176;hb=f90b8b66834b81b1022a05e14392857e77fccfca;hp=29fd156a1eece3dcd534cadeee7b436c73e5dede;hpb=72dc6fee623fdf32fa8f5ebbcae02f6cb9a4b088;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 29fd156a1..8fe365958 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,15 +10,20 @@
     tag:
       - latest:
           branch: master
+          slave: lf-virtual9
+      - iruya:
+          branch: stable/iruya
+          slave: lf-virtual4
       - hunter:
           branch: stable/hunter
+          slave: lf-virtual6
 
 - parameter:
     name: functest-slave
     parameters:
       - label:
           name: slave
-          default: functest-virtual
+          default: '{slave}'
 
 - parameter:
     name: functest-branch
@@ -94,11 +99,21 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          if [ "{tag}" = "latest" ]; then
+            py=3.6
+          else
+            py=2.7
+          fi
           sudo docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=True \
             -e EXTERNAL_NETWORK=public \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
+            -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\
+          site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
+            -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\
+          site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
@@ -134,7 +149,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-pull-containers:
           <<: *functest-containers
@@ -177,7 +193,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-remove-images:
           <<: *functest-containers
@@ -220,7 +237,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -253,6 +271,9 @@
       - neutron-tempest-plugin-api
       - rally_sanity
       - refstack_defcore
+      - refstack_compute
+      - refstack_object
+      - refstack_platform
       - tempest_full
       - tempest_scenario
       - patrole
@@ -260,6 +281,17 @@
       - networking-bgpvpn
       - networking-sfc
       - barbican
+    exclude:
+      - tag: latest
+        test: refstack_defcore
+      - tag: iruya
+        test: refstack_defcore
+      - tag: hunter
+        test: refstack_compute
+      - tag: hunter
+        test: refstack_object
+      - tag: hunter
+        test: refstack_platform
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -307,13 +339,14 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -377,6 +410,12 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
@@ -433,7 +472,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     scm:
       - functest-scm:
           ref: $GERRIT_REFSPEC
@@ -445,7 +485,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-check'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
     scm:
@@ -462,6 +503,7 @@
     port:
     container: alpine
     tag: 3.9
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
@@ -471,6 +513,7 @@
     port:
     container: alpine
     tag: 3.9
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
@@ -548,7 +591,8 @@
     name: 'functest-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
     properties:
@@ -556,7 +600,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -640,6 +684,12 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
@@ -723,13 +773,14 @@
       - functest-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -813,6 +864,12 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'