Merge changes If9b61064,I0490eade

[functest.git] / ci / run.yaml

diff --git a/ci/run.yaml b/ci/run.yaml
index 558956f..63dbdbd 100644 (file)
--- a/ci/run.yaml
+++ b/ci/run.yaml
@@ -11,6 +11,9 @@
             {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 \
+            -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:
@@ -66,10 +69,9 @@
       - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
+      - rally_jobs
       - refstack_defcore
       - patrole
-      - vmtp
-      - shaker
       - snaps_smoke
       - neutron_trunk
       - networking-bgpvpn
@@ -88,10 +90,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'
@@ -103,6 +104,30 @@
     jobs:
       - '{repo}-functest-smoke-{tag}-run'
 
+- project:
+    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