X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=b398e2dbc4357b3f35ce062aa898003b174960cd;hb=f9aadd16485c4359ccf69c982d6cc0513e37df48;hp=9afa64ba331b5fb1b50b293c41abcaa73221616e;hpb=3be3642cbb71478feda07e2f2f29b9b3462ec2c6;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 9afa64ba3..b398e2dbc 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -10,17 +10,20 @@
     tag:
       - latest:
           branch: master
+          slave: lf-virtual9
+      - iruya:
+          branch: stable/iruya
+          slave: lf-virtual4
       - hunter:
           branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
+          slave: functest-virtual
 
 - parameter:
     name: functest-slave
     parameters:
       - label:
           name: slave
-          default: functest-virtual
+          default: '{slave}'
 
 - parameter:
     name: functest-branch
@@ -98,7 +101,9 @@
           fi
           sudo docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e EXTERNAL_NETWORK=public1 \
+            -e DEBUG=True \
+            -e EXTERNAL_NETWORK=public \
+            -e DEBUG=true \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             $image run_tests -t {test}
@@ -136,7 +141,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-pull-containers:
           <<: *functest-containers
@@ -162,13 +168,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
-- project:
-    name: 'functest-opnfv-functest-components-pull'
-    <<: *functest-params
-    container: 'functest-components'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-pull'
-
 - project:
     name: 'functest-opnfv-functest-vnf-pull'
     <<: *functest-params
@@ -186,7 +185,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-remove-images:
           <<: *functest-containers
@@ -212,13 +212,6 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
-- project:
-    name: 'functest-opnfv-functest-components-rmi'
-    <<: *functest-params
-    container: 'functest-components'
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-rmi'
-
 - project:
     name: 'functest-opnfv-functest-vnf-rmi'
     <<: *functest-params
@@ -236,7 +229,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -257,8 +251,7 @@
       - vping_userdata
       - cinder_test
       - odl
-      - api_check
-      - snaps_health_check
+      - tempest_smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -267,13 +260,12 @@
     <<: *functest-params
     container: 'functest-smoke'
     test:
-      - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
-      - rally_jobs
       - refstack_defcore
+      - tempest_full
+      - tempest_scenario
       - patrole
-      - snaps_smoke
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
@@ -286,21 +278,13 @@
     <<: *functest-params
     container: 'functest-benchmarking'
     test:
+      - rally_full
+      - rally_jobs
       - vmtp
       - shaker
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
-- project:
-    name: 'functest-opnfv-functest-components'
-    <<: *functest-params
-    container: 'functest-components'
-    test:
-      - tempest_full
-      - tempest_scenario
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
 - project:
     name: 'functest-opnfv-functest-vnf'
     <<: *functest-params
@@ -320,7 +304,6 @@
     container: 'functest-features'
     test:
       - doctor-notification
-      - bgpvpn
       - functest-odl-sfc
       - barometercollectd
       - vgpu
@@ -334,13 +317,14 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -351,8 +335,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -366,8 +348,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-pull'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-pull'
@@ -397,26 +377,22 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -429,19 +405,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -458,8 +432,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
@@ -472,7 +444,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     scm:
       - functest-scm:
           ref: $GERRIT_REFSPEC
@@ -484,7 +457,8 @@
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-check'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
     scm:
@@ -496,20 +470,22 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.8-rmi'
+    name: 'functest-_-alpine-3.9-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.8-pull'
+    name: 'functest-_-alpine-3.9-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
@@ -563,16 +539,6 @@
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
 
-- project:
-    name: functest-opnfv-functest-components-{tag}-build
-    <<: *functest-params
-    container: functest-components
-    ref_arg:
-    path: docker/components
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-gate'
-      - 'functest-{repo}-{container}-{tag}-check'
-
 - project:
     name: functest-opnfv-functest-vnf-{tag}-build
     <<: *functest-params
@@ -597,7 +563,8 @@
     name: 'functest-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
     properties:
@@ -605,7 +572,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -616,8 +583,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -625,12 +590,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -651,8 +616,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-check'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-check'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-check'
@@ -682,26 +645,22 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -714,19 +673,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -743,8 +700,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'
@@ -784,13 +739,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-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -801,8 +757,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-rmi'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-rmi'
@@ -810,12 +764,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -836,8 +790,6 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-gate'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-gate'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-gate'
@@ -867,26 +819,22 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
@@ -899,19 +847,17 @@
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
               <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
@@ -928,8 +874,6 @@
           projects:
             - name: 'functest-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-features-{tag}-bgpvpn-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-functest-odl-sfc-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-features-{tag}-barometercollectd-run'