Update Snaps commit id

[functest.git] / ci / run.yaml

diff --git a/ci/run.yaml b/ci/run.yaml
index 28a5f82..c7e27ec 100644 (file)
--- a/ci/run.yaml
+++ b/ci/run.yaml
@@ -1,20 +1,22 @@
 ---
 - job-template:
-    name: '{repo}-{container}-{test}-{tag}-run'
+    name: '{repo}-functest-{container}-{test}-{tag}-run'
+    defaults: 'functest-defaults'
     builders:
       - shell: |
           docker run \
             -e NAMESERVER={nameserver} \
             -e EXTERNAL_NETWORK={external_network} \
+            -e STORAGE_PROTOCOL={storage_protocol} \
             -v \
             {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}
+            {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 +32,7 @@
       - api_check
       - snaps_health_check
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-healthcheck-{tag}-run'
@@ -59,23 +61,22 @@
       - '{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'
 
 - job-template:
     name: '{repo}-functest-smoke-{tag}-run'
@@ -87,9 +88,9 @@
             - 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-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'
@@ -102,14 +103,38 @@
       - '{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'
+
+- job-template:
+    name: '{repo}-functest-benchmarking-{tag}-run'
+    project-type: multijob
+    builders:
+      - multijob:
+          name: smoke
+          projects:
+            - name: '{repo}-functest-benchmarking-vmtp-{tag}-run'
+            - name: '{repo}-functest-benchmarking-shaker-{tag}-run'
+
+- 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'
 
 - job-template:
     name: '{repo}-functest-components-{tag}-run'
@@ -128,8 +153,8 @@
       - '{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 +162,7 @@
       - vyos_vrouter
       - juju_epc
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-vnf-{tag}-run'
@@ -158,8 +183,8 @@
       - '{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
@@ -169,7 +194,7 @@
       - vgpu
       - stor4nfv_os
     jobs:
-      - '{repo}-{container}-{test}-{tag}-run'
+      - '{repo}-functest-{container}-{test}-{tag}-run'
 
 - job-template:
     name: '{repo}-functest-features-{tag}-run'