Split kube-bench master and node

[functest-kubernetes.git] / ansible / site.yml

diff --git a/ansible/site.yml b/ansible/site.yml
index 9cbd50f..e4c169b 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -9,33 +9,53 @@
         dependencies:
           - repo: _
             dport:
-            container: golang
-            tag: 1.13-alpine3.11
+            container: alpine
+            tag: 3.12
         steps:
           - name: build opnfv/functest-kubernetes-core
             containers:
               - name: functest-kubernetes-core
                 ref_arg: BRANCH
                 path: docker/core
-          - name: build opnfv/functest-kubernetes-healthcheck
+          - name: build containers
             containers:
               - name: functest-kubernetes-healthcheck
                 ref_arg:
                 path: docker/healthcheck
-          - name: build containers
+              - name: functest-kubernetes-cnf
+                ref_arg: BRANCH
+                path: docker/cnf
+              - name: functest-kubernetes-security
+                ref_arg: BRANCH
+                path: docker/security
+          - name: build opnfv/functest-kubernetes-smoke
             containers:
               - name: functest-kubernetes-smoke
                 ref_arg:
                 path: docker/smoke
+          - name: build opnfv/functest-kubernetes-benchmarking
+            containers:
+              - name: functest-kubernetes-benchmarking
+                ref_arg:
+                path: docker/benchmarking
       suites:
-        - repo: opnfv
-          container: functest-kubernetes-healthcheck
+        - container: functest-kubernetes-healthcheck
           tests:
+            - k8s_quick
             - k8s_smoke
-        - repo: opnfv
-          container: functest-kubernetes-smoke
+        - container: functest-kubernetes-smoke
           tests:
             - xrally_kubernetes
             - k8s_conformance
-          properties:
-            execution-type: SEQUENTIALLY
+        - container: functest-kubernetes-security
+          tests:
+            - kube_hunter
+            - kube_bench_master
+            - kube_bench_node
+        - container: functest-kubernetes-benchmarking
+          tests:
+            - xrally_kubernetes_full
+        - container: functest-kubernetes-cnf
+          tests:
+            - cnf_conformance
+            - k8s_vims