summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2020-08-22 16:13:58 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-08-22 16:13:58 +0000
commit979e8ac6ac7acf78730a2eee199e0e8f78a316e1 (patch)
tree43c7585c19705794f0b378f012ee9d75ab9168ff /jjb
parentc58a9f854e5a54b8373480dda5fd0ccac5bcafd1 (diff)
parent63249698c6128867d75203b0d6c9e69f2e5b2445 (diff)
Merge "Add xrally_kubernetes_full in all gates"
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml34
-rw-r--r--jjb/functest/functest-kubernetes.yaml74
2 files changed, 108 insertions, 0 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 4df9eef6c..627d55f77 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -197,6 +197,13 @@
- 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
- project:
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-pull'
+ <<: *functest-kubernetes-pi-params
+ container: 'functest-kubernetes-benchmarking'
+ jobs:
+ - 'functest-kubernetes-pi-{repo}-{container}-{tag}-pull'
+
+- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-pull'
<<: *functest-kubernetes-pi-params
container: 'functest-kubernetes-cnf'
@@ -240,6 +247,13 @@
- 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
- project:
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-rmi'
+ <<: *functest-kubernetes-pi-params
+ container: 'functest-kubernetes-benchmarking'
+ jobs:
+ - 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
+
+- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-rmi'
<<: *functest-kubernetes-pi-params
container: 'functest-kubernetes-cnf'
@@ -324,6 +338,17 @@
- 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
+ <<: *functest-kubernetes-pi-params
+ container: 'functest-kubernetes-benchmarking'
+ test:
+ - xrally_kubernetes_full
+ privileged: 'false'
+ network: bridge
+ jobs:
+ - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf'
<<: *functest-kubernetes-pi-params
container: 'functest-kubernetes-cnf'
@@ -414,6 +439,8 @@
<<: *functest-kubernetes-pi-jobs
- name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-rmi'
<<: *functest-kubernetes-pi-jobs
+ - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-rmi'
+ <<: *functest-kubernetes-pi-jobs
- name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-rmi'
<<: *functest-kubernetes-pi-jobs
- multijob:
@@ -425,6 +452,8 @@
<<: *functest-kubernetes-pi-jobs
- name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-pull'
<<: *functest-kubernetes-pi-jobs
+ - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-pull'
+ <<: *functest-kubernetes-pi-jobs
- name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-pull'
<<: *functest-kubernetes-pi-jobs
- multijob:
@@ -447,6 +476,11 @@
- name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-pi-jobs
- multijob:
+ name: ollivier/functest-kubernetes-benchmarking:{tag}
+ projects:
+ - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+ <<: *functest-kubernetes-pi-jobs
+ - multijob:
name: ollivier/functest-kubernetes-cnf:{tag}
projects:
- name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-k8s_vims-run'
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index db5c50037..8295627b8 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -212,6 +212,13 @@
- 'functest-kubernetes-{repo}-{container}-{tag}-pull'
- project:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-pull'
+ <<: *functest-kubernetes-params
+ container: 'functest-kubernetes-benchmarking'
+ jobs:
+ - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+
+- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
<<: *functest-kubernetes-params
container: 'functest-kubernetes-cnf'
@@ -249,6 +256,13 @@
- 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
- project:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-rmi'
+ <<: *functest-kubernetes-params
+ container: 'functest-kubernetes-benchmarking'
+ jobs:
+ - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+
+- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
<<: *functest-kubernetes-params
container: 'functest-kubernetes-cnf'
@@ -327,6 +341,17 @@
- 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
- project:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking'
+ <<: *functest-kubernetes-params
+ container: 'functest-kubernetes-benchmarking'
+ test:
+ - xrally_kubernetes_full
+ privileged: 'false'
+ network: bridge
+ jobs:
+ - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+
+- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
<<: *functest-kubernetes-params
container: 'functest-kubernetes-cnf'
@@ -417,6 +442,8 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
<<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-pull'
+ <<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
<<: *functest-kubernetes-jobs
- multijob:
@@ -428,6 +455,8 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull'
<<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-pull'
+ <<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull'
<<: *functest-kubernetes-jobs
- multijob:
@@ -450,6 +479,11 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
- multijob:
+ name: opnfv/functest-kubernetes-benchmarking:{tag}
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+ <<: *functest-kubernetes-jobs
+ - multijob:
name: opnfv/functest-kubernetes-cnf:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
@@ -600,6 +634,22 @@
- 'functest-kubernetes-{repo}-{container}-{tag}-gate'
- 'functest-kubernetes-{repo}-{container}-{tag}-check'
+- project:
+ name: functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-build
+ <<: *functest-kubernetes-params
+ container: functest-kubernetes-benchmarking
+ ref_arg:
+ path: docker/benchmarking
+ exclude:
+ - tag: arm64-latest
+ - tag: arm64-kali
+ - tag: arm64-jerma
+ - tag: arm64-iruya
+ - tag: arm64-hunter
+ jobs:
+ - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+ - 'functest-kubernetes-{repo}-{container}-{tag}-check'
+
- job-template:
name: 'functest-kubernetes-{tag}-check'
project-type: multijob
@@ -630,6 +680,8 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
<<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+ <<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
<<: *functest-kubernetes-jobs
- multijob:
@@ -662,6 +714,11 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check'
<<: *functest-kubernetes-jobs
- multijob:
+ name: build opnfv/functest-kubernetes-benchmarking
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-check'
+ <<: *functest-kubernetes-jobs
+ - multijob:
name: opnfv/functest-kubernetes-healthcheck:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
@@ -674,6 +731,11 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
<<: *functest-kubernetes-jobs
- multijob:
+ name: opnfv/functest-kubernetes-benchmarking:{tag}
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+ <<: *functest-kubernetes-jobs
+ - multijob:
name: opnfv/functest-kubernetes-security:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
@@ -740,6 +802,8 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
<<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-rmi'
+ <<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
<<: *functest-kubernetes-jobs
- multijob:
@@ -772,6 +836,11 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
<<: *functest-kubernetes-jobs
- multijob:
+ name: build opnfv/functest-kubernetes-benchmarking
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-gate'
+ <<: *functest-kubernetes-jobs
+ - multijob:
name: opnfv/functest-kubernetes-healthcheck:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-k8s_smoke-run'
@@ -791,6 +860,11 @@
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
- multijob:
+ name: opnfv/functest-kubernetes-benchmarking:{tag}
+ projects:
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-xrally_kubernetes_full-run'
+ <<: *functest-kubernetes-jobs
+ - multijob:
name: opnfv/functest-kubernetes-cnf:{tag}
projects:
- name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'