Prepare backporting CNF to Hunter and newer

[releng.git] / jjb / functest / functest.ovn.yaml

diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 68a7d2e..96fa688 100644 (file)
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -142,8 +142,8 @@
             -e IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi \
             -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/tempest_conf.yaml:/usr/lib/python$py/\
-          site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\
+            -v /home/opnfv/functest/tempest_conf.yaml:/src/functest/\
+          functest/opnfv_tests/openstack/tempest/custom_tests/\
           tempest_conf.yaml \
             -v /home/opnfv/functest/.boto:/root/.boto \
             $image run_tests -t {test} -r -p
@@ -558,7 +558,7 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
@@ -627,7 +627,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs
@@ -674,29 +673,29 @@
           ref: $branch
 
 - project:
-    name: 'functest-ovn-_-alpine-3.11-rmi'
+    name: 'functest-ovn-_-alpine-3.12-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.11'
+    tag: '3.12'
     slave: master
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-ovn-_-alpine-3.11-pull'
+    name: 'functest-ovn-_-alpine-3.12-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.11'
+    tag: '3.12'
     slave: master
     jobs:
       - 'functest-ovn-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-core-{tag}-build
+    name: functest-ovn-opnfv-functest-core-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-core
+    container: functest-core
     ref_arg: BRANCH
     path: docker/core
     jobs:
@@ -704,9 +703,9 @@
       - 'functest-ovn-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-ovn-opnfv-functest-ovn-tempest-{tag}-build
+    name: functest-ovn-opnfv-functest-tempest-{tag}-build
     <<: *functest-ovn-params
-    container: functest-ovn-tempest
+    container: functest-tempest
     ref_arg: BRANCH
     path: docker/tempest
     jobs:
@@ -816,22 +815,22 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-rmi'
+            - name: 'functest-ovn-_-alpine-3.12-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-pull'
+            - name: 'functest-ovn-_-alpine-3.12-pull'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-core
+          name: build opnfv/functest-core
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-core-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-core-{tag}-check'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-tempest
+          name: build opnfv/functest-tempest
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-tempest-{tag}-check'
+            - name: 'functest-ovn-opnfv-functest-tempest-{tag}-check'
               <<: *functest-ovn-jobs
       - multijob:
           name: build containers
@@ -891,7 +890,7 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
@@ -960,7 +959,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs
@@ -1036,22 +1034,22 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-rmi'
+            - name: 'functest-ovn-_-alpine-3.12-rmi'
               <<: *functest-ovn-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-ovn-_-alpine-3.11-pull'
+            - name: 'functest-ovn-_-alpine-3.12-pull'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-core
+          name: build opnfv/functest-core
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-core-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-core-{tag}-gate'
               <<: *functest-ovn-jobs
       - multijob:
-          name: build opnfv/functest-ovn-tempest
+          name: build opnfv/functest-tempest
           projects:
-            - name: 'functest-ovn-opnfv-functest-ovn-tempest-{tag}-gate'
+            - name: 'functest-ovn-opnfv-functest-tempest-{tag}-gate'
               <<: *functest-ovn-jobs
       - multijob:
           name: build containers
@@ -1111,7 +1109,7 @@
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *functest-ovn-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+            - name: 'functest-ovn-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
               <<: *functest-ovn-jobs
             - name: 'functest-ovn-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-ovn-jobs
@@ -1180,7 +1178,6 @@
               <<: *functest-ovn-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
-          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-ovn-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-ovn-jobs