summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-02 10:43:06 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-02 11:14:50 +0200
commit696aacaa5489b3fa5ba54795b012d104b59638f5 (patch)
tree45db94624b2db437344f73d64d11fe2dfbc773ce /jjb
parent253c41ebee08fe26dc19ff1adc1cf1f5e3db916a (diff)
Add Functest CNTT benchmarking testcases in OVN
It doesn't run shaker and vtmp which are equal in IaaS verification and CNTT conformance. CNTT benchmarking testcase costs time for quite nothing but it verifies both processes (IaaS verification and CNTT conformance). Change-Id: Ibab8b037e8e6ef6ecf52c67dd1159792b880f865 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest.ovn.yaml102
-rw-r--r--jjb/functest/functest.yaml4
2 files changed, 87 insertions, 19 deletions
diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index b3ae260df..8d2a673b6 100644
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -207,6 +207,13 @@
- 'functest-ovn-{repo}-{container}-{tag}-pull'
- project:
+ name: 'functest-ovn-opnfv-functest-benchmarking-cntt-pull'
+ <<: *functest-ovn-params
+ container: 'functest-benchmarking-cntt'
+ jobs:
+ - 'functest-ovn-{repo}-{container}-{tag}-pull'
+
+- project:
name: 'functest-ovn-opnfv-functest-vnf-pull'
<<: *functest-ovn-params
container: 'functest-vnf'
@@ -251,6 +258,13 @@
- 'functest-ovn-{repo}-{container}-{tag}-rmi'
- project:
+ name: 'functest-ovn-opnfv-functest-benchmarking-cntt-rmi'
+ <<: *functest-ovn-params
+ container: 'functest-benchmarking-cntt'
+ jobs:
+ - 'functest-ovn-{repo}-{container}-{tag}-rmi'
+
+- project:
name: 'functest-ovn-opnfv-functest-vnf-rmi'
<<: *functest-ovn-params
container: 'functest-vnf'
@@ -343,13 +357,13 @@
<<: *functest-ovn-params
container: 'functest-smoke-cntt'
test:
- - neutron-tempest-plugin-api
- - tempest_cinder
- - tempest_keystone
- - rally_sanity
- - tempest_full
- - tempest_scenario
- - tempest_slow
+ - neutron-tempest-plugin-api-cntt
+ - tempest_cinder_cntt
+ - tempest_keystone_cntt
+ - rally_sanity_cntt
+ - tempest_full_cntt
+ - tempest_scenario_cntt
+ - tempest_slow_cntt
jobs:
- 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
@@ -366,6 +380,16 @@
- 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'functest-ovn-opnfv-functest-benchmarking-cntt'
+ <<: *functest-ovn-params
+ container: 'functest-benchmarking-cntt'
+ test:
+ - rally_full_cntt
+ - rally_jobs_cntt
+ jobs:
+ - 'functest-ovn-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'functest-ovn-opnfv-functest-vnf'
<<: *functest-ovn-params
container: 'functest-vnf'
@@ -449,6 +473,8 @@
<<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi'
<<: *functest-ovn-jobs
- multijob:
@@ -462,6 +488,8 @@
<<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-pull'
<<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-pull'
+ <<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-vnf-{tag}-pull'
<<: *functest-ovn-jobs
- multijob:
@@ -563,6 +591,14 @@
- name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *functest-ovn-jobs
- multijob:
+ name: opnfv/functest-benchmarking-cntt:{tag}
+ condition: ALWAYS
+ projects:
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+ <<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+ <<: *functest-ovn-jobs
+ - multijob:
name: opnfv/functest-vnf:{tag}
condition: ALWAYS
execution-type: SEQUENTIALLY
@@ -676,6 +712,16 @@
- 'functest-ovn-{repo}-{container}-{tag}-check'
- project:
+ name: functest-ovn-opnfv-functest-smoke-cntt-{tag}-build
+ <<: *functest-ovn-params
+ container: functest-smoke-cntt
+ ref_arg: BRANCH
+ path: docker/smoke
+ jobs:
+ - 'functest-ovn-{repo}-{container}-{tag}-gate'
+ - 'functest-ovn-{repo}-{container}-{tag}-check'
+
+- project:
name: functest-ovn-opnfv-functest-benchmarking-{tag}-build
<<: *functest-ovn-params
container: functest-benchmarking
@@ -686,21 +732,21 @@
- 'functest-ovn-{repo}-{container}-{tag}-check'
- project:
- name: functest-ovn-opnfv-functest-vnf-{tag}-build
+ name: functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-build
<<: *functest-ovn-params
- container: functest-vnf
- ref_arg:
- path: docker/vnf
+ container: functest-benchmarking-cntt
+ ref_arg: BRANCH
+ path: docker/benchmarking-cntt
jobs:
- 'functest-ovn-{repo}-{container}-{tag}-gate'
- 'functest-ovn-{repo}-{container}-{tag}-check'
- project:
- name: functest-ovn-opnfv-functest-smoke-cntt-{tag}-build
+ name: functest-ovn-opnfv-functest-vnf-{tag}-build
<<: *functest-ovn-params
- container: functest-smoke-cntt
- ref_arg: BRANCH
- path: docker/smoke-cntt
+ container: functest-vnf
+ ref_arg:
+ path: docker/vnf
jobs:
- 'functest-ovn-{repo}-{container}-{tag}-gate'
- 'functest-ovn-{repo}-{container}-{tag}-check'
@@ -737,6 +783,8 @@
<<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi'
<<: *functest-ovn-jobs
- multijob:
@@ -771,10 +819,12 @@
- name: 'functest-ovn-opnfv-functest-vnf-{tag}-check'
<<: *functest-ovn-jobs
- multijob:
- name: build opnfv/functest-smoke-cntt
+ name: build cntt containers
projects:
- name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-check'
<<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-check'
+ <<: *functest-ovn-jobs
- multijob:
name: opnfv/functest-healthcheck:{tag}
projects:
@@ -870,6 +920,13 @@
- name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *functest-ovn-jobs
- multijob:
+ name: opnfv/functest-benchmarking-cntt:{tag}
+ projects:
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+ <<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+ <<: *functest-ovn-jobs
+ - multijob:
name: opnfv/functest-vnf:{tag}
execution-type: SEQUENTIALLY
projects:
@@ -940,6 +997,8 @@
<<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *functest-ovn-jobs
- name: 'functest-ovn-opnfv-functest-vnf-{tag}-rmi'
<<: *functest-ovn-jobs
- multijob:
@@ -974,10 +1033,12 @@
- name: 'functest-ovn-opnfv-functest-vnf-{tag}-gate'
<<: *functest-ovn-jobs
- multijob:
- name: build opnfv/functest-smoke-cntt
+ name: build cntt containers
projects:
- name: 'functest-ovn-opnfv-functest-smoke-cntt-{tag}-gate'
<<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-gate'
+ <<: *functest-ovn-jobs
- multijob:
name: opnfv/functest-healthcheck:{tag}
projects:
@@ -1073,6 +1134,13 @@
- name: 'functest-ovn-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *functest-ovn-jobs
- multijob:
+ name: opnfv/functest-benchmarking-cntt:{tag}
+ projects:
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+ <<: *functest-ovn-jobs
+ - name: 'functest-ovn-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+ <<: *functest-ovn-jobs
+ - multijob:
name: opnfv/functest-vnf:{tag}
execution-type: SEQUENTIALLY
projects:
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 1ed78e32b..2af228549 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -823,7 +823,7 @@
- name: 'functest-opnfv-functest-vnf-{tag}-check'
<<: *functest-jobs
- multijob:
- name: build opnfv/functest-smoke-cntt
+ name: build cntt containers
projects:
- name: 'functest-opnfv-functest-smoke-cntt-{tag}-check'
<<: *functest-jobs
@@ -1037,7 +1037,7 @@
- name: 'functest-opnfv-functest-vnf-{tag}-gate'
<<: *functest-jobs
- multijob:
- name: build opnfv/functest-smoke-cntt
+ name: build cntt containers
projects:
- name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
<<: *functest-jobs