X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ansible%2Fsite.yml;h=bf2eb25248e580ac28c286e8a1457bb6b585994c;hb=6eaf848638d7a1a7b4c4324837da9b8562ec7136;hp=829f51a28c0eb3a3d8bad0ef599e2a2ef52ab33c;hpb=adaa8ba5907040fdd8198d3fb801256021514dd5;p=functest-kubernetes.git

diff --git a/ansible/site.yml b/ansible/site.yml
index 829f51a2..bf2eb252 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -4,53 +4,33 @@
     - role: collivier.xtesting
       project: functest-kubernetes
       db_project: functest
-      gerrit_project: functest-kubernetes
-      builds:
-        dependencies:
-          - repo: _
-            dport:
-            container: golang
-            tag: 1.13-alpine3.11
-        steps:
-          - name: build opnfv/functest-kubernetes-core
-            containers:
-              - name: functest-kubernetes-core
-                ref_arg: BRANCH
-                path: docker/core
-          - name: build opnfv/functest-kubernetes-healthcheck
-            containers:
-              - name: functest-kubernetes-healthcheck
-                ref_arg:
-                path: docker/healthcheck
-              - name: functest-kubernetes-cnf
-                ref_arg: BRANCH
-                path: docker/cnf
-              - name: functest-kubernetes-security
-                ref_arg: BRANCH
-                path: docker/security
-          - name: build containers
-            containers:
-              - name: functest-kubernetes-smoke
-                ref_arg:
-                path: docker/smoke
       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
+          timeout: 3h
           tests:
             - xrally_kubernetes
             - k8s_conformance
-          properties:
-            execution-type: SEQUENTIALLY
-        - repo: opnfv
-          container: functest-kubernetes-cnf
-          tests:
-            - k8s_vims
-        - repo: opnfv
-          container: functest-kubernetes-security
+            - sig_api_machinery
+            - sig_apps
+            - sig_auth
+            - sig_cli
+            - sig_network
+            - sig_network_features
+            - sig_storage
+        - container: functest-kubernetes-security
           tests:
             - kube_hunter
-            - kube_bench
+            - kube_bench_master
+            - kube_bench_node
+        - container: functest-kubernetes-benchmarking
+          tests:
+            - xrally_kubernetes_full
+        - container: functest-kubernetes-cnf
+          tests:
+            - k8s_vims
+            - helm_vims
+            - cnf_conformance