Remove all kube_bench exclusions

It has been backported in all branches.

Change-Id: I81e6ed3acce74cffdcd98a67717f2e44553df760
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 8f601ce..864e3b0 100644 (file)
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -317,64 +317,8 @@
     container: 'functest-kubernetes-security'
     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:
@@ -529,8 +473,6 @@
           projects:
             - name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *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'

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index d7e163a..e3b8d0c 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -314,46 +314,8 @@
     container: 'functest-kubernetes-security'
     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:
@@ -503,8 +465,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *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'
@@ -775,8 +735,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *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'
@@ -900,8 +858,6 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *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'