X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=5535898581a39fc40c6497811d3af8d0e634e075;hb=e1f021c2d45e25e1ab13637f410d325f934bcd15;hp=45e063c5f67fee2af79b1772135b22781c66077d;hpb=e016a1177abbc0069d8eb172cb367f0d03d7f3bb;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 45e063c5f..553589858 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -10,15 +10,29 @@
     tag:
       - latest:
           branch: master
+          slave: lf-virtual8
+      - jerma:
+          branch: stable/jerma
+          slave: lf-virtual8
+      - iruya:
+          branch: stable/iruya
+          slave: lf-virtual7
       - hunter:
           branch: stable/hunter
+          slave: lf-virtual5
 
 - parameter:
     name: functest-kubernetes-slave
     parameters:
       - label:
           name: slave
-          default: functest-virtual
+          default: '{slave}'
+
+- parameter:
+    name: functest-kubernetes-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
 
 - parameter:
     name: functest-kubernetes-branch
@@ -27,6 +41,19 @@
           name: branch
           default: '{branch}'
 
+- parameter:
+    name: functest-kubernetes-DEPLOY_SCENARIO
+    parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: k8-nosdn-nofeature-noha
+- parameter:
+    name: functest-kubernetes-DEBUG
+    parameters:
+      - string:
+          name: DEBUG
+          default: 'true'
+
 - functest-kubernetes-containers: &functest-kubernetes-containers
     name: 'functest-kubernetes-containers'
     repo: '{repo}'
@@ -35,16 +62,10 @@
     tag: '{tag}'
 
 - functest-kubernetes-run-containers: &functest-kubernetes-run-containers
-    name: 'functest-kubernetes-build-containers'
+    name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
     test: '{test}'
 
-- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
-    name: 'functest-kubernetes-build-containers'
-    <<: *functest-kubernetes-containers
-    ref_arg: '{ref_arg}'
-    path: '{path}'
-
 - builder:
     name: functest-kubernetes-pull-containers
     builders:
@@ -57,13 +78,14 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker pull $image
+          docker pull $image
 
 - builder:
-    name: functest-kubernetes-build-containers
+    name: functest-kubernetes-run-containers
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -71,22 +93,26 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
-          fi
-          cd {path}
-          sudo docker build $build_arg \
-            --pull=false --no-cache --force-rm=true \
-            -t $image .
+          docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$slave \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+            -e DEBUG=$DEBUG \
+            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
+            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            $image run_tests -t {test} -p -r
 
 - builder:
-    name: functest-kubernetes-run-containers
+    name: functest-kubernetes-remove-images
     builders:
       - shell: |
-          set +ex
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          set +x
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -94,21 +120,16 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
-            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
-            -v /home/opnfv/functest-kubernetes/config:/root/.kube/config \
-            $image run_tests -t {test}
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+          docker rmi $image || true
+
+- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
+    name: 'functest-kubernetes-build-containers'
+    <<: *functest-kubernetes-containers
+    ref_arg: '{ref_arg}'
+    path: '{path}'
 
 - builder:
-    name: functest-kubernetes-remove-images
+    name: functest-kubernetes-build-containers
     builders:
       - shell: |
           set +x
@@ -119,7 +140,15 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker rmi $image || true
+          if [ "{ref_arg}" = "None" ]; then
+            build_arg=""
+          else
+            build_arg="--build-arg {ref_arg}={ref}"
+          fi
+          cd {path}
+          docker build $build_arg \
+            --pull=false --no-cache --force-rm=true \
+            -t $image .
 
 - scm:
     name: functest-kubernetes-scm
@@ -133,7 +162,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     builders:
       - functest-kubernetes-pull-containers:
           <<: *functest-kubernetes-containers
@@ -153,16 +183,32 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-features-pull'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-features'
+    container: 'functest-kubernetes-cnf'
+    exclude:
+      - tag: jerma
+      - tag: iruya
+      - tag: hunter
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-security'
+    exclude:
+      - tag: jerma
+      - tag: iruya
+      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     builders:
       - functest-kubernetes-remove-images:
           <<: *functest-kubernetes-containers
@@ -182,16 +228,38 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-features-rmi'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-cnf'
+    exclude:
+      - tag: jerma
+      - tag: iruya
+      - tag: hunter
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-features'
+    container: 'functest-kubernetes-security'
+    exclude:
+      - tag: jerma
+      - tag: iruya
+      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -210,33 +278,125 @@
     <<: *functest-kubernetes-params
     container: 'functest-kubernetes-smoke'
     test:
+      - xrally_kubernetes
       - k8s_conformance
+    exclude:
+      - tag: iruya
+        test: xrally_kubernetes
+      - tag: hunter
+        test: xrally_kubernetes
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-cnf'
+    test:
+      - k8s_vims
+    exclude:
+      - tag: jerma
+        test: k8s_vims
+      - tag: iruya
+        test: k8s_vims
+      - tag: hunter
+        test: k8s_vims
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-features'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-features'
+    container: 'functest-kubernetes-security'
     test:
-      - stor4nfv_k8s
-      - clover_k8s
+      - kube_hunter
+      - kube_bench
+    exclude:
+      - tag: jerma
+        test: kube_hunter
+      - tag: jerma
+        test: kube_bench
+      - tag: iruya
+        test: kube_hunter
+      - tag: iruya
+        test: kube_bench
+      - tag: hunter
+        test: kube_hunter
+      - tag: hunter
+        test: kube_bench
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
+
+- builder:
+    name: functest-kubernetes-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+            -e DEBUG=$DEBUG \
+            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
+            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'functest-kubernetes-{tag}-zip'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
+    builders:
+      - functest-kubernetes-zip:
+          <<: *functest-kubernetes-containers
+
+- project:
+    name: 'functest-kubernetes-{tag}-zip'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-healthcheck'
+    jobs:
+      - 'functest-kubernetes-{tag}-zip'
+
 - job-template:
     name: 'functest-kubernetes-{tag}-daily'
     project-type: multijob
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -245,7 +405,9 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull containers
@@ -254,7 +416,9 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-pull'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
@@ -263,21 +427,35 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: opnfv/functest-kubernetes-features:{tag}
+          name: opnfv/functest-kubernetes-cnf:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+              <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-security:{tag}
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
+              <<: *functest-kubernetes-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'functest-kubernetes-{tag}-zip'
               <<: *functest-kubernetes-jobs
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     scm:
       - functest-kubernetes-scm:
           ref: $GERRIT_REFSPEC
@@ -289,7 +467,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-check'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
       - functest-kubernetes-branch:
           branch: '{branch}'
     scm:
@@ -301,20 +480,22 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
     repo: _
     port:
     container: golang
-    tag: alpine3.9
+    tag: '1.13-alpine3.11'
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
     repo: _
     port:
     container: golang
-    tag: alpine3.9
+    tag: '1.13-alpine3.11'
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -339,21 +520,39 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build
     <<: *functest-kubernetes-params
-    container: functest-kubernetes-smoke
-    ref_arg:
-    path: docker/smoke
+    container: functest-kubernetes-cnf
+    ref_arg: BRANCH
+    path: docker/cnf
+    exclude:
+      - tag: jerma
+      - tag: iruya
+      - tag: hunter
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
+      - 'functest-kubernetes-{repo}-{container}-{tag}-check'
+
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-build
+    <<: *functest-kubernetes-params
+    container: functest-kubernetes-security
+    ref_arg: BRANCH
+    path: docker/security
+    exclude:
+      - tag: jerma
+      - tag: iruya
+      - tag: hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build
     <<: *functest-kubernetes-params
-    container: functest-kubernetes-features
+    container: functest-kubernetes-smoke
     ref_arg:
-    path: docker/features
+    path: docker/smoke
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -362,15 +561,22 @@
     name: 'functest-kubernetes-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
       - functest-kubernetes-branch:
           branch: '{branch}'
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -379,17 +585,19 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -401,13 +609,15 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-check'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-check'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-check'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: build containers
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-check'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -415,15 +625,23 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: opnfv/functest-kubernetes-features:{tag}
+          name: opnfv/functest-kubernetes-cnf:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+              <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-security:{tag}
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
               <<: *functest-kubernetes-jobs
 
 - trigger:
@@ -456,13 +674,20 @@
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -471,17 +696,19 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-rmi'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -493,13 +720,15 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-gate'
+              <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-gate'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: build containers
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-gate'
-              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -507,15 +736,23 @@
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-smoke:{tag}
+          execution-type: SEQUENTIALLY
           projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
+              <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
       - multijob:
-          name: opnfv/functest-kubernetes-features:{tag}
+          name: opnfv/functest-kubernetes-cnf:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+              <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-security:{tag}
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-stor4nfv_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_hunter-run'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-clover_k8s-run'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-kube_bench-run'
               <<: *functest-kubernetes-jobs
 
 - project: