diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2020-09-13 14:12:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-09-13 14:12:31 +0000 |
| commit | 662629d5871bc1e55c362291fda2fc8be6ae72ee (patch) | |
| tree | 64440158b0bd9e3c3544d96b20bbb934d86e6ede /jjb | |
| parent | ef5f6b3ccbc1a94cc85c4667c97ffa6e687aacf3 (diff) | |
| parent | 212d1a5308aea1ddb7c6b4285c08c0ab366965da (diff) | |
Merge "Take last kube_bench split into account"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/functest-kubernetes-pi.yaml | 61 | ||||
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 51 |
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: |