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

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 45e063c5f..427ccc2ff 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -10,15 +10,20 @@
     tag:
       - latest:
           branch: master
+          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-branch
@@ -57,7 +62,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker pull $image
+          docker pull $image
 
 - builder:
     name: functest-kubernetes-build-containers
@@ -77,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 .
 
@@ -85,8 +90,9 @@
     name: functest-kubernetes-run-containers
     builders:
       - shell: |
-          set +ex
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          set +e
+          set -x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -94,14 +100,14 @@
           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/ \
-            gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
+          gsutil -dd -m cp -r $WORKSPACE/ \
+            gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID
           find $WORKSPACE -type f \
             -printf \
             "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n"
@@ -119,7 +125,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker rmi $image || true
+          docker rmi $image || true
 
 - scm:
     name: functest-kubernetes-scm
@@ -133,7 +139,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
@@ -162,7 +169,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
@@ -191,7 +199,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
@@ -230,13 +239,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
@@ -277,7 +287,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
@@ -289,7 +300,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:
@@ -306,6 +318,7 @@
     port:
     container: golang
     tag: alpine3.9
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
@@ -315,6 +328,7 @@
     port:
     container: golang
     tag: alpine3.9
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
@@ -362,7 +376,8 @@
     name: 'functest-kubernetes-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
       - functest-kubernetes-branch:
           branch: '{branch}'
     properties:
@@ -370,7 +385,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
@@ -456,13 +471,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