X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=f5fadeb6b92bbe68c886489464176de6727b727d;hb=c9321951ce4e0ec2f378ad0cb89c71199a0306b7;hp=4a60c648420bfef0db0afd0ffa29bfe49684083d;hpb=21c2b0fbca399eb2894813ff63768390d97e161d;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 4a60c6484..f5fadeb6b 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -99,13 +99,18 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          if [ "{tag}" = "latest" ]; then
+            py=3.7
+          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/python2.7/\
+            -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\
           site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
             $image run_tests -t {test}
           res=$?
@@ -274,17 +279,22 @@
       - networking-bgpvpn
       - networking-sfc
       - barbican
+      - octavia
     exclude:
       - tag: latest
         test: refstack_defcore
       - tag: iruya
         test: refstack_defcore
+      - tag: iruya
+        test: octavia
       - tag: hunter
         test: refstack_compute
       - tag: hunter
         test: refstack_object
       - tag: hunter
         test: refstack_platform
+      - tag: hunter
+        test: octavia
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -369,8 +379,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-jobs
@@ -398,8 +406,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
-          execution-type: PARALLEL
-          condition: SUCCESSFUL
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -427,10 +433,10 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
@@ -443,7 +449,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -457,8 +462,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-features:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
@@ -500,21 +503,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.9-rmi'
+    name: 'functest-_-alpine-3.10-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: '3.10'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.9-pull'
+    name: 'functest-_-alpine-3.10-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: '3.10'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
@@ -538,6 +541,8 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
+    exclude:
+      - tag: latest
 
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
@@ -620,12 +625,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-rmi'
+            - name: 'functest-_-alpine-3.10-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-pull'
+            - name: 'functest-_-alpine-3.10-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -652,8 +657,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-jobs
@@ -681,8 +684,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
-          execution-type: PARALLEL
-          condition: SUCCESSFUL
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -710,10 +711,10 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
@@ -726,7 +727,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -740,8 +740,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-features:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
@@ -809,12 +807,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-rmi'
+            - name: 'functest-_-alpine-3.10-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.9-pull'
+            - name: 'functest-_-alpine-3.10-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -841,8 +839,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *functest-jobs
@@ -870,8 +866,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
-          execution-type: PARALLEL
-          condition: SUCCESSFUL
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
@@ -899,10 +893,10 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
@@ -915,7 +909,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -929,8 +922,6 @@
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-features:{tag}
-          execution-type: PARALLEL
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs