X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-kubernetes.yaml;h=a1b53f77245d372742505265379062a51599f51c;hb=a62f077c802ff57a50f05a4d2b8389b7a300ef10;hp=ae87498a6a1adfa7707641024a345967204eb234;hpb=bcd0ecb50359270320bfd41ecd443a2a6528af3f;p=releng.git

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index ae87498a6..a1b53f772 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -10,17 +10,20 @@
     tag:
       - latest:
           branch: master
+          slave: lf-virtual8
+      - iruya:
+          branch: stable/iruya
+          slave: lf-virtual7
       - hunter:
           branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
+          slave: lf-virtual5
 
 - parameter:
     name: functest-kubernetes-slave
     parameters:
       - label:
           name: slave
-          default: functest-virtual
+          default: '{slave}'
 
 - parameter:
     name: functest-kubernetes-branch
@@ -59,7 +62,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker pull $image
+          docker pull $image
 
 - builder:
     name: functest-kubernetes-build-containers
@@ -79,7 +82,7 @@
             build_arg="--build-arg {ref_arg}={ref}"
           fi
           cd {path}
-          sudo docker build $build_arg \
+          docker build $build_arg \
             --pull=false --no-cache --force-rm=true \
             -t $image .
 
@@ -88,7 +91,7 @@
     builders:
       - shell: |
           set +ex
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -96,10 +99,10 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
+          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 \
+            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
@@ -121,7 +124,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker rmi $image || true
+          docker rmi $image || true
 
 - scm:
     name: functest-kubernetes-scm
@@ -135,7 +138,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
@@ -164,7 +168,8 @@
 - 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
@@ -193,7 +198,8 @@
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -213,8 +219,14 @@
     container: 'functest-kubernetes-smoke'
     test:
       - k8s_conformance
+      - xrally_kubernetes
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+    exclude:
+      - tag: iruya
+        test: xrally_kubernetes
+      - tag: hunter
+        test: xrally_kubernetes
 
 - project:
     name: 'functest-kubernetes-opnfv-functest-kubernetes-features'
@@ -232,13 +244,14 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     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
@@ -268,6 +281,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-features:{tag}
           projects:
@@ -279,7 +294,8 @@
 - 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
@@ -291,7 +307,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:
@@ -303,20 +320,22 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+    name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+    name: 'functest-kubernetes-_-golang-alpine3.9-pull'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -331,30 +350,30 @@
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-functest-kubernetes-healthcheck-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-build
     <<: *functest-kubernetes-params
-    container: functest-functest-kubernetes-healthcheck
-    ref_arg: BRANCH
+    container: functest-kubernetes-healthcheck
+    ref_arg:
     path: docker/healthcheck
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-functest-kubernetes-smoke-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-build
     <<: *functest-kubernetes-params
-    container: functest-functest-kubernetes-smoke
-    ref_arg: BRANCH
+    container: functest-kubernetes-smoke
+    ref_arg:
     path: docker/smoke
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
       - 'functest-kubernetes-{repo}-{container}-{tag}-check'
 
 - project:
-    name: functest-kubernetes-opnfv-functest-functest-kubernetes-features-{tag}-build
+    name: functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-build
     <<: *functest-kubernetes-params
-    container: functest-functest-kubernetes-features
-    ref_arg: BRANCH
+    container: functest-kubernetes-features
+    ref_arg:
     path: docker/features
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-gate'
@@ -364,7 +383,8 @@
     name: 'functest-kubernetes-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
       - functest-kubernetes-branch:
           branch: '{branch}'
     properties:
@@ -372,7 +392,7 @@
           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
@@ -386,12 +406,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -401,14 +421,14 @@
       - multijob:
           name: build opnfv/functest-kubernetes-healthcheck
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-functest-kubernetes-healthcheck-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-check'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build containers
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-functest-kubernetes-smoke-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-check'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-functest-kubernetes-features-{tag}-check'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-check'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
@@ -420,6 +440,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-features:{tag}
           projects:
@@ -458,13 +480,14 @@
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     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
@@ -478,12 +501,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -493,14 +516,14 @@
       - multijob:
           name: build opnfv/functest-kubernetes-healthcheck
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-functest-kubernetes-healthcheck-{tag}-gate'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-gate'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build containers
           projects:
-            - name: 'functest-kubernetes-opnfv-functest-functest-kubernetes-smoke-{tag}-gate'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-gate'
               <<: *functest-kubernetes-jobs
-            - name: 'functest-kubernetes-opnfv-functest-functest-kubernetes-features-{tag}-gate'
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-features-{tag}-gate'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-healthcheck:{tag}
@@ -512,6 +535,8 @@
           projects:
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+            - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-xrally_kubernetes-run'
+              <<: *functest-kubernetes-jobs
       - multijob:
           name: opnfv/functest-kubernetes-features:{tag}
           projects: