X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Frun.yaml;h=a1d233d3a57575b0055109d83e22a5cd167d343d;hb=284e30415fdec9c1a17c7f0b0b023fb0bbf045ce;hp=ad2a225ed37282ff07907e599764e6e5d930af00;hpb=69f0b2665b397e5128bf7a83541d3567c4834af3;p=functest.git

diff --git a/ci/run.yaml b/ci/run.yaml
index ad2a225ed..a1d233d3a 100644
--- a/ci/run.yaml
+++ b/ci/run.yaml
@@ -1,6 +1,7 @@
 ---
 - job-template:
-    name: '{repo}-{container}-{test}-{tag}-run'
+    name: '{repo}-functest-{container}-{test}-{tag}-run'
+    defaults: 'functest-defaults'
     builders:
       - shell: |
           docker run \
@@ -10,11 +11,14 @@
             {prefix}/results/$JOB_NAME-$BUILD_ID:/home/opnfv/functest/results \
             -v {prefix}/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v {prefix}/images:/home/opnfv/functest/images \
-            {repo}/{container}:{tag} run_tests -t {test}
+            -v {prefix}/tempest_conf.yaml:\
+          /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack\
+          /tempest/custom_tests/tempest_conf.yaml \
+            {repo}/functest-{container}:{tag} run_tests -t {test}
 
 - project:
-    name: '{repo}-healthcheck-{test}-{tag}-run'
-    container: functest-healthcheck
+    name: repo-functest-healthcheck-test-tag-run
+    container: healthcheck
     test:
       - connection_check
       - tenantnetwork1
@@ -30,7 +34,24 @@
       - api_check
       - snaps_health_check
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
+
+- functest-healthcheckjobs: &functest-healthcheckjobs
+    name: 'functest-healthcheckjobs'
+    projects:
+      - name: '{repo}-functest-healthcheck-connection_check-{tag}-run'
+      - name: '{repo}-functest-healthcheck-tenantnetwork1-{tag}-run'
+      - name: '{repo}-functest-healthcheck-tenantnetwork2-{tag}-run'
+      - name: '{repo}-functest-healthcheck-vmready1-{tag}-run'
+      - name: '{repo}-functest-healthcheck-vmready2-{tag}-run'
+      - name: '{repo}-functest-healthcheck-singlevm1-{tag}-run'
+      - name: '{repo}-functest-healthcheck-singlevm2-{tag}-run'
+      - name: '{repo}-functest-healthcheck-vping_ssh-{tag}-run'
+      - name: '{repo}-functest-healthcheck-vping_userdata-{tag}-run'
+      - name: '{repo}-functest-healthcheck-cinder_test-{tag}-run'
+      - name: '{repo}-functest-healthcheck-odl-{tag}-run'
+      - name: '{repo}-functest-healthcheck-api_check-{tag}-run'
+      - name: '{repo}-functest-healthcheck-snaps_health_check-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-healthcheck-{tag}-run'
@@ -38,44 +59,45 @@
     builders:
       - multijob:
           name: healthcheck
-          projects:
-            - name: '{repo}-functest-healthcheck-connection_check-{tag}-run'
-            - name: '{repo}-functest-healthcheck-tenantnetwork1-{tag}-run'
-            - name: '{repo}-functest-healthcheck-tenantnetwork2-{tag}-run'
-            - name: '{repo}-functest-healthcheck-vmready1-{tag}-run'
-            - name: '{repo}-functest-healthcheck-vmready2-{tag}-run'
-            - name: '{repo}-functest-healthcheck-singlevm1-{tag}-run'
-            - name: '{repo}-functest-healthcheck-singlevm2-{tag}-run'
-            - name: '{repo}-functest-healthcheck-vping_ssh-{tag}-run'
-            - name: '{repo}-functest-healthcheck-vping_userdata-{tag}-run'
-            - name: '{repo}-functest-healthcheck-cinder_test-{tag}-run'
-            - name: '{repo}-functest-healthcheck-odl-{tag}-run'
-            - name: '{repo}-functest-healthcheck-api_check-{tag}-run'
-            - name: '{repo}-functest-healthcheck-snaps_health_check-{tag}-run'
+          <<: *functest-healthcheckjobs
 
 - project:
-    name: '{repo}-functest-healthcheck-{tag}-run'
+    name: repo-functest-healthcheck-tag-run
     jobs:
       - '{repo}-functest-healthcheck-{tag}-run'
 
 - project:
-    name: '{repo}-smoke-{test}-{tag}-run'
-    container: functest-smoke
+    name: repo-functest-smoke-test-tag-run
+    container: smoke
     test:
       - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
+      - rally_jobs
       - refstack_defcore
       - patrole
-      - vmtp
-      - shaker
       - snaps_smoke
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
       - barbican
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
+
+- functest-smokejobs: &functest-smokejobs
+    name: 'functest-smokejobs'
+    projects:
+      - name: '{repo}-functest-smoke-tempest_smoke-{tag}-run'
+      - name: '{repo}-functest-smoke-neutron-tempest-plugin-api-{tag}-run'
+      - name: '{repo}-functest-smoke-rally_sanity-{tag}-run'
+      - name: '{repo}-functest-smoke-rally_jobs-{tag}-run'
+      - name: '{repo}-functest-smoke-refstack_defcore-{tag}-run'
+      - name: '{repo}-functest-smoke-patrole-{tag}-run'
+      - name: '{repo}-functest-smoke-snaps_smoke-{tag}-run'
+      - name: '{repo}-functest-smoke-neutron_trunk-{tag}-run'
+      - name: '{repo}-functest-smoke-networking-bgpvpn-{tag}-run'
+      - name: '{repo}-functest-smoke-networking-sfc-{tag}-run'
+      - name: '{repo}-functest-smoke-barbican-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-smoke-{tag}-run'
@@ -83,33 +105,57 @@
     builders:
       - multijob:
           name: smoke
-          projects:
-            - name: '{repo}-functest-smoke-tempest_smoke-{tag}-run'
-            - name: '{repo}-functest-smoke-neutron-tempest-plugin-api-{tag}-run'
-            - name: '{repo}-functest-smoke-rally_sanity-{tag}-run'
-            - name: '{repo}-functest-smoke-patrole-{tag}-run'
-            - name: '{repo}-functest-smoke-vmtp-{tag}-run'
-            - name: '{repo}-functest-smoke-shaker-{tag}-run'
-            - name: '{repo}-functest-smoke-snaps_smoke-{tag}-run'
-            - name: '{repo}-functest-smoke-neutron_trunk-{tag}-run'
-            - name: '{repo}-functest-smoke-networking-bgpvpn-{tag}-run'
-            - name: '{repo}-functest-smoke-networking-sfc-{tag}-run'
-            - name: '{repo}-functest-smoke-barbican-{tag}-run'
+          <<: *functest-smokejobs
 
 - project:
-    name: '{repo}-functest-smoke-{tag}-run'
+    name: 'repo-functest-smoke-tag-run'
     jobs:
       - '{repo}-functest-smoke-{tag}-run'
 
 - project:
-    name: '{repo}-components-{test}-{tag}-run'
-    container: functest-components
+    name: 'repo-functest-benchmarking-test-tag-run'
+    container: benchmarking
+    test:
+      - vmtp
+      - shaker
+    jobs:
+      - '{repo}-functest-{container}-{test}-{tag}-run'
+
+- functest-benchmarkingjobs: &functest-benchmarkingjobs
+    name: 'functest-benchmarkingjobs'
+    projects:
+      - name: '{repo}-functest-benchmarking-vmtp-{tag}-run'
+      - name: '{repo}-functest-benchmarking-shaker-{tag}-run'
+
+- job-template:
+    name: '{repo}-functest-benchmarking-{tag}-run'
+    project-type: multijob
+    builders:
+      - multijob:
+          name: benchmarking
+          <<: *functest-benchmarkingjobs
+
+- project:
+    name: repo-functest-benchmarking-tag-run
+    jobs:
+      - '{repo}-functest-benchmarking-{tag}-run'
+
+- project:
+    name: repo-functest-components-test-tag-run
+    container: components
     test:
       - tempest_full
       - tempest_scenario
       - rally_full
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
+
+- functest-componentsjobs: &functest-componentsjobs
+    name: 'functest-componentsjobs'
+    projects:
+      - name: '{repo}-functest-components-tempest_full-{tag}-run'
+      - name: '{repo}-functest-components-tempest_scenario-{tag}-run'
+      - name: '{repo}-functest-components-rally_full-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-components-{tag}-run'
@@ -117,19 +163,16 @@
     builders:
       - multijob:
           name: components
-          projects:
-            - name: '{repo}-functest-components-tempest_full-{tag}-run'
-            - name: '{repo}-functest-components-tempest_scenario-{tag}-run'
-            - name: '{repo}-functest-components-rally_full-{tag}-run'
+          <<: *functest-componentsjobs
 
 - project:
-    name: '{repo}-functest-components-{tag}-run'
+    name: repo-functest-components-tag-run
     jobs:
       - '{repo}-functest-components-{tag}-run'
 
 - project:
-    name: '{repo}-vnf-{test}-{tag}-run'
-    container: functest-vnf
+    name: repo-functest-vnf-test-tag-run
+    container: vnf
     test:
       - cloudify
       - cloudify_ims
@@ -137,7 +180,16 @@
       - vyos_vrouter
       - juju_epc
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
+
+- functest-vnfjobs: &functest-vnfjobs
+    name: 'functest-vnfjobs'
+    projects:
+      - name: '{repo}-functest-vnf-cloudify-{tag}-run'
+      - name: '{repo}-functest-vnf-cloudify_ims-{tag}-run'
+      - name: '{repo}-functest-vnf-heat_ims-{tag}-run'
+      - name: '{repo}-functest-vnf-vyos_vrouter-{tag}-run'
+      - name: '{repo}-functest-vnf-juju_epc-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-vnf-{tag}-run'
@@ -145,21 +197,16 @@
     builders:
       - multijob:
           name: vnf
-          projects:
-            - name: '{repo}-functest-vnf-cloudify-{tag}-run'
-            - name: '{repo}-functest-vnf-cloudify_ims-{tag}-run'
-            - name: '{repo}-functest-vnf-heat_ims-{tag}-run'
-            - name: '{repo}-functest-vnf-vyos_vrouter-{tag}-run'
-            - name: '{repo}-functest-vnf-juju_epc-{tag}-run'
+          <<: *functest-vnfjobs
 
 - project:
-    name: '{repo}-functest-vnf-{tag}-run'
+    name: 'repo-functest-vnf-tag-run'
     jobs:
       - '{repo}-functest-vnf-{tag}-run'
 
 - project:
-    name: '{repo}-features-{test}-{tag}-run'
-    container: functest-features
+    name: repo-functest-features-test-tag-run
+    container: features
     test:
       - doctor-notification
       - bgpvpn
@@ -167,8 +214,20 @@
       - barometercollectd
       - fds
       - vgpu
+      - stor4nfv_os
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
+
+- functest-featuresjobs: &functest-featuresjobs
+    name: 'functest-featuresjobs'
+    projects:
+      - name: '{repo}-functest-features-doctor-notification-{tag}-run'
+      - name: '{repo}-functest-features-bgpvpn-{tag}-run'
+      - name: '{repo}-functest-features-functest-odl-sfc-{tag}-run'
+      - name: '{repo}-functest-features-barometercollectd-{tag}-run'
+      - name: '{repo}-functest-features-fds-{tag}-run'
+      - name: '{repo}-functest-features-vgpu-{tag}-run'
+      - name: '{repo}-functest-features-stor4nfv_os-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-features-{tag}-run'
@@ -176,15 +235,9 @@
     builders:
       - multijob:
           name: features
-          projects:
-            - name: '{repo}-functest-features-doctor-notification-{tag}-run'
-            - name: '{repo}-functest-features-bgpvpn-{tag}-run'
-            - name: '{repo}-functest-features-functest-odl-sfc-{tag}-run'
-            - name: '{repo}-functest-features-barometercollectd-{tag}-run'
-            - name: '{repo}-functest-features-fds-{tag}-run'
-            - name: '{repo}-functest-features-vgpu-{tag}-run'
+          <<: *functest-featuresjobs
 
 - project:
-    name: '{repo}-functest-features-{tag}-run'
+    name: repo-functest-features-tag-run
     jobs:
       - '{repo}-functest-features-{tag}-run'