Merge "Remove KVMFORNFV Jobs"

diff --git a/jjb/functest/functest-kubernetes-docker.yaml b/jjb/functest/functest-kubernetes-docker.yaml
index afd1c1d..414e92f 100644 (file)
--- a/jjb/functest/functest-kubernetes-docker.yaml
+++ b/jjb/functest/functest-kubernetes-docker.yaml
@@ -42,16 +42,10 @@
     exclude:
       - stream: 'jerma'
         image: 'cnf'
-      - stream: 'jerma'
-        image: 'security'
       - stream: 'iruya'
         image: 'cnf'
-      - stream: 'iruya'
-        image: 'security'
       - stream: 'hunter'
         image: 'cnf'
-      - stream: 'hunter'
-        image: 'security'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 08085ea..3beedb3 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -200,8 +200,6 @@
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-security'
-    exclude:
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -243,8 +241,6 @@
     name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-security'
-    exclude:
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
@@ -310,11 +306,6 @@
     test:
       - kube_hunter
       - kube_bench
-    exclude:
-      - tag: hunter
-        test: kube_hunter
-      - tag: hunter
-        test: kube_bench
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -530,8 +521,6 @@
     container: functest-kubernetes-security
     ref_arg: BRANCH
     path: docker/security
-    exclude:
-      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'