X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=ac8113b454e90ac3b593762e347b2c5c06d2a972;hb=84a6d583428b452e64ab732043d6c455fab83cd6;hp=12c9c26a1678b2cbd4acaa22fefad96ce98ead90;hpb=8e65f2cf23f2a54aab01a54195dd154b4d96d91a;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 12c9c26a1..ac8113b45 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -10,16 +10,19 @@
     tag:
       - latest:
           branch: master
-          slave: lf-virtual8
+          slave: lf-virtual1-5
+      - kali:
+          branch: stable/kali
+          slave: lf-virtual1-4
       - jerma:
           branch: stable/jerma
-          slave: lf-virtual8
+          slave: lf-virtual1-3
       - iruya:
           branch: stable/iruya
-          slave: lf-virtual7
+          slave: lf-virtual1-2
       - hunter:
           branch: stable/hunter
-          slave: lf-virtual5
+          slave: lf-virtual1-1
 
 - parameter:
     name: functest-kubernetes-slave
@@ -28,6 +31,12 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: functest-kubernetes-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: functest-kubernetes-branch
     parameters:
@@ -35,6 +44,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}'
@@ -43,16 +65,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:
@@ -68,10 +84,11 @@
           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
@@ -79,22 +96,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}
-          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" ] && rm -rf $WORKSPACE/* || true
+          set +x
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -102,18 +123,16 @@
           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/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \
-            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
-            $image run_tests -t {test} -p
+          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
@@ -124,7 +143,15 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          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
@@ -158,6 +185,28 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
+    <<: *functest-kubernetes-params
+    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:
@@ -181,11 +230,39 @@
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
+- project:
+    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-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:
           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
@@ -206,13 +283,102 @@
     test:
       - xrally_kubernetes
       - k8s_conformance
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
     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-security'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-security'
+    test:
+      - 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" ] && sudo 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'
@@ -222,6 +388,12 @@
     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'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -236,6 +408,10 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - 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
           projects:
@@ -243,6 +419,10 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-pull'
               <<: *functest-kubernetes-jobs
+            - 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}
           projects:
@@ -256,6 +436,23 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-security:{tag}
+          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
+      - multijob:
+          name: opnfv/functest-kubernetes-cnf:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-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'
@@ -286,21 +483,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi'
+    name: 'functest-kubernetes-_-golang-1.13-alpine3.12-rmi'
     repo: _
     port:
     container: golang
-    tag: '1.12-alpine3.10'
+    tag: '1.13-alpine3.12'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
+    name: 'functest-kubernetes-_-golang-1.13-alpine3.12-pull'
     repo: _
     port:
     container: golang
-    tag: '1.12-alpine3.10'
+    tag: '1.13-alpine3.12'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@ -325,6 +522,34 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
+- project:
+    name: functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-build
+    <<: *functest-kubernetes-params
+    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-smoke-{tag}-build
     <<: *functest-kubernetes-params
@@ -341,8 +566,14 @@
     parameters:
       - 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
@@ -357,15 +588,19 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - 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-1.12-alpine3.10-rmi'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -377,6 +612,10 @@
           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:
@@ -395,6 +634,18 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-security:{tag}
+          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
+      - multijob:
+          name: opnfv/functest-kubernetes-cnf:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+              <<: *functest-kubernetes-jobs
 
 - trigger:
     name: functest-kubernetes-patchset-created
@@ -428,6 +679,12 @@
     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'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -442,15 +699,19 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-rmi'
               <<: *functest-kubernetes-jobs
+            - 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-1.12-alpine3.10-rmi'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -462,6 +723,10 @@
           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:
@@ -480,6 +745,18 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: opnfv/functest-kubernetes-security:{tag}
+          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
+      - multijob:
+          name: opnfv/functest-kubernetes-cnf:{tag}
+          projects:
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-k8s_vims-run'
+              <<: *functest-kubernetes-jobs
 
 - project:
     name: 'functest-kubernetes'