summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-09-13 15:11:37 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2020-09-13 15:11:37 +0200
commit212d1a5308aea1ddb7c6b4285c08c0ab366965da (patch)
tree5ac8414b97cab9223eaccdaca32c95575b39003f /jjb/functest
parentfdff7a638217793989d2e420122cdc3ba3f138bc (diff)
Take last kube_bench split into account
Change-Id: I781c64850464f6ecf35530cd454541d481a73012 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml61
-rw-r--r--jjb/functest/functest-kubernetes.yaml51
2 files changed, 112 insertions, 0 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 079580db5..8f601cecd 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -318,6 +318,63 @@
test:
- kube_hunter
- kube_bench
+ - kube_bench_master
+ - kube_bench_node
+ exclude:
+ - tag: latest
+ test: kube_bench
+ - tag: kali
+ test: kube_bench_master
+ - tag: kali
+ test: kube_bench_node
+ - tag: jerma
+ test: kube_bench_master
+ - tag: jerma
+ test: kube_bench_node
+ - tag: iruya
+ test: kube_bench_master
+ - tag: iruya
+ test: kube_bench_node
+ - tag: hunter
+ test: kube_bench_master
+ - tag: hunter
+ test: kube_bench_node
+ - tag: arm-latest
+ test: kube_bench
+ - tag: arm-kali
+ test: kube_bench_master
+ - tag: arm-kali
+ test: kube_bench_node
+ - tag: arm-jerma
+ test: kube_bench_master
+ - tag: arm-jerma
+ test: kube_bench_node
+ - tag: arm-iruya
+ test: kube_bench_master
+ - tag: arm-iruya
+ test: kube_bench_node
+ - tag: arm-hunter
+ test: kube_bench_master
+ - tag: arm-hunter
+ test: kube_bench_node
+ - tag: arm64-latest
+ test: kube_bench
+ - tag: arm64-kali
+ test: kube_bench_master
+ - tag: arm64-kali
+ test: kube_bench_node
+ - tag: arm64-jerma
+ test: kube_bench_master
+ - tag: arm64-jerma
+ test: kube_bench_node
+ - tag: arm64-iruya
+ test: kube_bench_master
+ - tag: arm64-iruya
+ test: kube_bench_node
+ - tag: arm64-hunter
+ test: kube_bench_master
+ - tag: arm64-hunter
+ test: kube_bench_node
privileged: 'false'
network: bridge
jobs:
@@ -474,6 +531,10 @@
<<: *functest-kubernetes-pi-jobs
- name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-pi-jobs
+ - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench_master-run'
+ <<: *functest-kubernetes-pi-jobs
+ - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_bench_node-run'
+ <<: *functest-kubernetes-pi-jobs
- multijob:
name: ollivier/functest-kubernetes-benchmarking:{tag}
projects:
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 78768e7e1..d7e163a12 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -315,6 +315,45 @@
test:
- kube_hunter
- kube_bench
+ - kube_bench_master
+ - kube_bench_node
+ exclude:
+ - tag: latest
+ test: kube_bench
+ - tag: kali
+ test: kube_bench_master
+ - tag: kali
+ test: kube_bench_node
+ - tag: jerma
+ test: kube_bench_master
+ - tag: jerma
+ test: kube_bench_node
+ - tag: iruya
+ test: kube_bench_master
+ - tag: iruya
+ test: kube_bench_node
+ - tag: hunter
+ test: kube_bench_master
+ - tag: hunter
+ test: kube_bench_node
+ - tag: arm64-latest
+ test: kube_bench
+ - tag: arm64-kali
+ test: kube_bench_master
+ - tag: arm64-kali
+ test: kube_bench_node
+ - tag: arm64-jerma
+ test: kube_bench_master
+ - tag: arm64-jerma
+ test: kube_bench_node
+ - tag: arm64-iruya
+ test: kube_bench_master
+ - tag: arm64-iruya
+ test: kube_bench_node
+ - tag: arm64-hunter
+ test: kube_bench_master
+ - tag: arm64-hunter
+ test: kube_bench_node
privileged: 'false'
network: bridge
jobs:
@@ -466,6 +505,10 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+ <<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
+ <<: *functest-kubernetes-jobs
- multijob:
name: opnfv/functest-kubernetes-benchmarking:{tag}
projects:
@@ -734,6 +777,10 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+ <<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
+ <<: *functest-kubernetes-jobs
- multijob:
name: opnfv/functest-kubernetes-cnf:{tag}
projects:
@@ -855,6 +902,10 @@
<<: *functest-kubernetes-jobs
- name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
<<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_master-run'
+ <<: *functest-kubernetes-jobs
+ - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench_node-run'
+ <<: *functest-kubernetes-jobs
- multijob:
name: opnfv/functest-kubernetes-benchmarking:{tag}
projects: