summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/functest/functest.yaml31
1 files changed, 24 insertions, 7 deletions
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index d24ee120b..29f25a0f4 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -266,7 +266,6 @@
- tempest_smoke
- neutron-tempest-plugin-api
- rally_sanity
- - rally_jobs
- refstack_defcore
- patrole
- snaps_smoke
@@ -278,6 +277,15 @@
- 'functest-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'functest-opnfv-functest-smoke-2'
+ <<: *functest-params
+ container: 'functest-smoke'
+ test:
+ - rally_jobs
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'functest-opnfv-functest-benchmarking'
<<: *functest-params
container: 'functest-benchmarking'
@@ -407,8 +415,6 @@
<<: *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'
@@ -424,6 +430,11 @@
- name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-smoke:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{tag}
projects:
- name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
@@ -694,8 +705,6 @@
<<: *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'
@@ -711,6 +720,11 @@
- name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-smoke:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{tag}
projects:
- name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
@@ -881,8 +895,6 @@
<<: *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'
@@ -898,6 +910,11 @@
- name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-smoke:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-benchmarking:{tag}
projects:
- name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'