summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-04-02 09:57:54 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-04-02 10:15:37 +0200
commitd57a33ff94d8092438b39bc1a7b60c55424cade9 (patch)
tree646f3506b4f0d1c165c8a5eb77a23e46eb93d4c4 /jjb
parentd255c3cf1ce784d611a947063728a600f5f38154 (diff)
Add Functest CNTT benchmarking testcases
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: I793a9ca12fc13a19dd7d672010b4149f3cd82452 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/airship/cntt.yaml40
-rw-r--r--jjb/functest/functest.yaml67
2 files changed, 107 insertions, 0 deletions
diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index a2f7d717b..5198abad1 100644
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -206,6 +206,13 @@
- 'cntt-{repo}-{container}-{tag}-pull'
- project:
+ name: 'cntt-opnfv-functest-benchmarking-cntt-pull'
+ <<: *cntt-params
+ container: 'functest-benchmarking-cntt'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-pull'
+
+- project:
name: 'cntt-opnfv-functest-vnf-pull'
<<: *cntt-params
container: 'functest-vnf'
@@ -250,6 +257,13 @@
- 'cntt-{repo}-{container}-{tag}-rmi'
- project:
+ name: 'cntt-opnfv-functest-benchmarking-cntt-rmi'
+ <<: *cntt-params
+ container: 'functest-benchmarking-cntt'
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-rmi'
+
+- project:
name: 'cntt-opnfv-functest-vnf-rmi'
<<: *cntt-params
container: 'functest-vnf'
@@ -340,6 +354,16 @@
- 'cntt-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'cntt-opnfv-functest-benchmarking-cntt'
+ <<: *cntt-params
+ container: 'functest-benchmarking-cntt'
+ test:
+ - rally_full
+ - rally_jobs
+ jobs:
+ - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'cntt-opnfv-functest-vnf'
<<: *cntt-params
container: 'functest-vnf'
@@ -431,6 +455,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
<<: *cntt-jobs
- multijob:
@@ -444,6 +470,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-pull'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-pull'
<<: *cntt-jobs
- multijob:
@@ -535,6 +563,14 @@
- name: 'cntt-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *cntt-jobs
- multijob:
+ name: opnfv/functest-benchmarking-cntt:{functest_tag}
+ condition: ALWAYS
+ projects:
+ - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+ <<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+ <<: *cntt-jobs
+ - multijob:
name: opnfv/functest-vnf:{functest_tag}
condition: ALWAYS
execution-type: SEQUENTIALLY
@@ -616,6 +652,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
<<: *cntt-jobs
- multijob:
@@ -629,6 +667,8 @@
<<: *cntt-jobs
- name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
<<: *cntt-jobs
+ - name: 'cntt-opnfv-functest-benchmarking-cntt-{tag}-pull'
+ <<: *cntt-jobs
- name: 'cntt-opnfv-functest-vnf-{tag}-pull'
<<: *cntt-jobs
- multijob:
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 1262004d4..aad50c808 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -218,6 +218,13 @@
- 'functest-{repo}-{container}-{tag}-pull'
- project:
+ name: 'functest-opnfv-functest-benchmarking-cntt-pull'
+ <<: *functest-params
+ container: 'functest-benchmarking-cntt'
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-pull'
+
+- project:
name: 'functest-opnfv-functest-vnf-pull'
<<: *functest-params
container: 'functest-vnf'
@@ -262,6 +269,13 @@
- 'functest-{repo}-{container}-{tag}-rmi'
- project:
+ name: 'functest-opnfv-functest-benchmarking-cntt-rmi'
+ <<: *functest-params
+ container: 'functest-benchmarking-cntt'
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-rmi'
+
+- project:
name: 'functest-opnfv-functest-vnf-rmi'
<<: *functest-params
container: 'functest-vnf'
@@ -377,6 +391,16 @@
- 'functest-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'functest-opnfv-functest-benchmarking-cntt'
+ <<: *functest-params
+ container: 'functest-benchmarking-cntt'
+ test:
+ - rally_full
+ - rally_jobs
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'functest-opnfv-functest-vnf'
<<: *functest-params
container: 'functest-vnf'
@@ -460,6 +484,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-rmi'
<<: *functest-jobs
- multijob:
@@ -473,6 +499,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-pull'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-pull'
<<: *functest-jobs
- multijob:
@@ -570,6 +598,13 @@
- name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-benchmarking-cntt:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-vnf:{tag}
execution-type: SEQUENTIALLY
projects:
@@ -691,6 +726,16 @@
- 'functest-{repo}-{container}-{tag}-check'
- project:
+ name: functest-opnfv-functest-benchmarking-cntt-{tag}-build
+ <<: *functest-params
+ container: functest-benchmarking-cntt
+ ref_arg: BRANCH
+ path: docker/benchmarking-cntt
+ jobs:
+ - 'functest-{repo}-{container}-{tag}-gate'
+ - 'functest-{repo}-{container}-{tag}-check'
+
+- project:
name: functest-opnfv-functest-vnf-{tag}-build
<<: *functest-params
container: functest-vnf
@@ -742,6 +787,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-rmi'
<<: *functest-jobs
- multijob:
@@ -780,6 +827,8 @@
projects:
- name: 'functest-opnfv-functest-smoke-cntt-{tag}-check'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-check'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-healthcheck:{tag}
projects:
@@ -875,6 +924,13 @@
- name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-benchmarking-cntt:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-vnf:{tag}
execution-type: SEQUENTIALLY
projects:
@@ -945,6 +1001,8 @@
<<: *functest-jobs
- name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rmi'
+ <<: *functest-jobs
- name: 'functest-opnfv-functest-vnf-{tag}-rmi'
<<: *functest-jobs
- multijob:
@@ -983,6 +1041,8 @@
projects:
- name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
<<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-gate'
+ <<: *functest-jobs
- multijob:
name: opnfv/functest-healthcheck:{tag}
projects:
@@ -1078,6 +1138,13 @@
- name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
<<: *functest-jobs
- multijob:
+ name: opnfv/functest-benchmarking-cntt:{tag}
+ projects:
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_full_cntt-run'
+ <<: *functest-jobs
+ - name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-rally_jobs_cntt-run'
+ <<: *functest-jobs
+ - multijob:
name: opnfv/functest-vnf:{tag}
execution-type: SEQUENTIALLY
projects: