X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=7093ba1e5850101a2aedc908db2138ac2396e187;hb=0c37a675a3df3dc3091c7bd27a270b3bfc403f71;hp=e7d1870c31f93d1634ab6a0c8a4b616a3dfd5424;hpb=a67786b44aaa5518caaf941309607b1461bf662c;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index e7d1870c3..7093ba1e5 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -23,6 +23,21 @@
       - hunter:
           branch: stable/hunter
           slave: lf-virtual1-1
+      - arm64-latest:
+          branch: master
+          slave: lf-virtual1-5
+      - arm64-kali:
+          branch: stable/kali
+          slave: lf-virtual1-4
+      - arm64-jerma:
+          branch: stable/jerma
+          slave: lf-virtual1-3
+      - arm64-iruya:
+          branch: stable/iruya
+          slave: lf-virtual1-2
+      - arm64-hunter:
+          branch: stable/hunter
+          slave: lf-virtual1-1
 
 - parameter:
     name: functest-kubernetes-slave
@@ -68,6 +83,8 @@
     name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
     test: '{test}'
+    privileged: '{privileged}'
+    network: '{network}'
 
 - builder:
     name: functest-kubernetes-pull-containers
@@ -97,6 +114,8 @@
             image={repo}:{port}/{container}:{tag}
           fi
           docker run --rm \
+            --privileged={privileged} \
+            --network={network} \
             -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 \
@@ -186,24 +205,16 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-cnf'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
+    container: 'functest-kubernetes-security'
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-pull'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-pull'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
+    container: 'functest-kubernetes-cnf'
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -231,24 +242,16 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-cnf'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
+    container: 'functest-kubernetes-security'
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-security-rmi'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-rmi'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
-    exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
+    container: 'functest-kubernetes-cnf'
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
@@ -273,6 +276,8 @@
     container: 'functest-kubernetes-healthcheck'
     test:
       - k8s_smoke
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -283,50 +288,31 @@
     test:
       - xrally_kubernetes
       - k8s_conformance
-    exclude:
-      - tag: iruya
-        test: xrally_kubernetes
-      - tag: hunter
-        test: xrally_kubernetes
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-security'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-cnf'
+    container: 'functest-kubernetes-security'
     test:
-      - k8s_vims
-    exclude:
-      - tag: jerma
-        test: k8s_vims
-      - tag: iruya
-        test: k8s_vims
-      - tag: hunter
-        test: k8s_vims
+      - kube_hunter
+      - kube_bench
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-kubernetes-opnfv-functest-kubernetes-security'
+    name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
     <<: *functest-kubernetes-params
-    container: 'functest-kubernetes-security'
+    container: 'functest-kubernetes-cnf'
     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
+      - k8s_vims
+    privileged: 'false'
+    network: bridge
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
 
@@ -336,7 +322,7 @@
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -399,7 +385,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
+            - '^functest-kubernetes(-pi)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
     builders:
       - multijob:
           name: remove former images
@@ -408,10 +394,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
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: pull containers
           projects:
@@ -419,10 +405,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
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-pull'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
           projects:
@@ -430,7 +416,6 @@
               <<: *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
@@ -483,22 +468,34 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
+    name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
     repo: _
     port:
     container: golang
-    tag: '1.13-alpine3.11'
+    tag: '1.15-alpine3.12'
     slave: master
+    exclude:
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
+    name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
     repo: _
     port:
     container: golang
-    tag: '1.13-alpine3.11'
+    tag: '1.15-alpine3.12'
     slave: master
+    exclude:
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -508,6 +505,12 @@
     container: functest-kubernetes-core
     ref_arg: BRANCH
     path: docker/core
+    exclude:
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -518,6 +521,12 @@
     container: functest-kubernetes-healthcheck
     ref_arg:
     path: docker/healthcheck
+    exclude:
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -529,9 +538,11 @@
     ref_arg: BRANCH
     path: docker/cnf
     exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -543,9 +554,11 @@
     ref_arg: BRANCH
     path: docker/security
     exclude:
-      - tag: jerma
-      - tag: iruya
-      - tag: hunter
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -556,6 +569,12 @@
     container: functest-kubernetes-smoke
     ref_arg:
     path: docker/smoke
+    exclude:
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
@@ -579,7 +598,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
+            - '^functest-kubernetes(-pi)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
     builders:
       - multijob:
           name: remove former images
@@ -588,19 +607,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
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -628,7 +647,6 @@
               <<: *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
@@ -690,7 +708,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
+            - '^functest-kubernetes(-pi)?-(arm.*-|amd64-)*[a-z]+-(daily|gate|check)$'
     builders:
       - multijob:
           name: remove former images
@@ -699,19 +717,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
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-rmi'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
+            - name: 'functest-kubernetes-_-golang-1.15-alpine3.12-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -739,7 +757,6 @@
               <<: *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
@@ -763,6 +780,17 @@
     <<: *functest-kubernetes-params
     jobs:
       - 'functest-kubernetes-{tag}-daily'
+
+- project:
+    name: 'functest-kubernetes-gate'
+    <<: *functest-kubernetes-params
+    exclude:
+      - tag: arm64-latest
+      - tag: arm64-kali
+      - tag: arm64-jerma
+      - tag: arm64-iruya
+      - tag: arm64-hunter
+    jobs:
       - 'functest-kubernetes-{tag}-check'
       - 'functest-kubernetes-{tag}-gate'
 
@@ -776,4 +804,16 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^functest-kubernetes-[a-z]+-(daily|check|gate)$
+    regex: ^functest-kubernetes-(arm.*-|amd64-)*[a-z]+-daily$
+
+- view:
+    name: functest-kubernetes-gate
+    view-type: list
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+    regex: ^functest-kubernetes-(arm.*-|amd64-)*[a-z]+-gate$