X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=15bddb90b4313760e7b0f58c88017cd6fe209871;hb=0a2dfdffb822f822e041085a8e32fe4f87d55f87;hp=c92e70d94c33e26d7b671d834bf8aafdd97d86d7;hpb=5a2a4ffc8a9455af33c971c5dec2ca18262f8040;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index c92e70d94..15bddb90b 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -100,7 +100,7 @@
             image={repo}:{port}/{container}:{tag}
           fi
           if [ "{tag}" = "latest" ]; then
-            py=3.6
+            py=3.7
           else
             py=2.7
           fi
@@ -374,8 +374,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
@@ -403,8 +401,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
@@ -434,8 +430,6 @@
               <<: *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
@@ -448,7 +442,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -462,8 +455,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
@@ -505,21 +496,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'
@@ -543,6 +534,8 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
+    exclude:
+      - tag: latest
 
 - project:
     name: functest-opnfv-functest-healthcheck-{tag}-build
@@ -625,12 +618,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
@@ -657,8 +650,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
@@ -686,8 +677,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
@@ -717,8 +706,6 @@
               <<: *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
@@ -731,7 +718,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -745,8 +731,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
@@ -814,12 +798,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
@@ -846,8 +830,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
@@ -875,8 +857,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
@@ -906,8 +886,6 @@
               <<: *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
@@ -920,7 +898,6 @@
       - multijob:
           name: opnfv/functest-vnf:{tag}
           execution-type: SEQUENTIALLY
-          condition: ALWAYS
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -934,8 +911,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