X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting.yaml;h=b34fc100c006ab83e0c314a282ede759607edecd;hb=2d1656e1df9421811315cc23a54b7fe57f215c17;hp=48c0952cc2447c64cfe3aca4d9fe6ec77a99c135;hpb=562efe3dfe8c077a7872563c43523b9d913c9d61;p=releng.git

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 48c0952cc..b34fc100c 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -10,17 +10,23 @@
     tag:
       - latest:
           branch: master
+          slave: lf-virtual1
+      - jerma:
+          branch: stable/jerma
+          slave: lf-virtual1
       - iruya:
           branch: stable/iruya
+          slave: lf-virtual1
       - hunter:
           branch: stable/hunter
+          slave: lf-virtual1
 
 - parameter:
     name: xtesting-slave
     parameters:
       - label:
           name: slave
-          default: lf-build2
+          default: '{slave}'
 
 - parameter:
     name: xtesting-branch
@@ -87,7 +93,7 @@
     name: xtesting-run-containers
     builders:
       - shell: |
-          set +ex
+          set +x
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -97,16 +103,13 @@
             image={repo}:{port}/{container}:{tag}
           fi
           sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/xtesting/.boto:/root/.boto \
             -e DEBUG=true \
-            $image run_tests -t {test}
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            $image run_tests -t {test} -p
 
 - builder:
     name: xtesting-remove-images
@@ -134,7 +137,8 @@
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-pull'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     builders:
       - xtesting-pull-containers:
           <<: *xtesting-containers
@@ -149,7 +153,8 @@
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-rmi'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     builders:
       - xtesting-remove-images:
           <<: *xtesting-containers
@@ -164,7 +169,8 @@
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     builders:
       - xtesting-run-containers:
           <<: *xtesting-run-containers
@@ -179,6 +185,12 @@
       - third
       - fourth
       - fifth
+      - sixth
+    exclude:
+      - tag: hunter
+        test: sixth
+      - tag: iruya
+        test: sixth
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
@@ -188,13 +200,14 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-[a-z]+-(daily|check|gate)$'
+            - '^xtesting-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -219,11 +232,14 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
+              <<: *xtesting-jobs
 
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-gate'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     scm:
       - xtesting-scm:
           ref: $GERRIT_REFSPEC
@@ -235,7 +251,8 @@
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-check'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
       - xtesting-branch:
           branch: '{branch}'
     scm:
@@ -247,20 +264,22 @@
           ref: $branch
 
 - project:
-    name: 'xtesting-_-alpine-3.9-rmi'
+    name: 'xtesting-_-alpine-3.10-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: '3.10'
+    slave: master
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'xtesting-_-alpine-3.9-pull'
+    name: 'xtesting-_-alpine-3.10-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.9
+    tag: '3.10'
+    slave: master
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
@@ -278,7 +297,8 @@
     name: 'xtesting-{tag}-check'
     project-type: multijob
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
       - xtesting-branch:
           branch: '{branch}'
     properties:
@@ -286,7 +306,7 @@
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-[a-z]+-(daily|check|gate)$'
+            - '^xtesting-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -296,15 +316,15 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.9-rmi'
+            - name: 'xtesting-_-alpine-3.10-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.9-pull'
+            - name: 'xtesting-_-alpine-3.10-pull'
               <<: *xtesting-jobs
       - multijob:
-          name: opnfv/functest-xtesting
+          name: opnfv/xtesting
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-check'
               <<: *xtesting-jobs
@@ -321,6 +341,8 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
+              <<: *xtesting-jobs
 
 - trigger:
     name: xtesting-patchset-created
@@ -352,13 +374,14 @@
       - xtesting-patchset-created:
           branch: '{branch}'
     parameters:
-      - xtesting-slave
+      - xtesting-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-[a-z]+-(daily|check|gate)$'
+            - '^xtesting-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
@@ -368,15 +391,15 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.9-rmi'
+            - name: 'xtesting-_-alpine-3.10-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.9-pull'
+            - name: 'xtesting-_-alpine-3.10-pull'
               <<: *xtesting-jobs
       - multijob:
-          name: opnfv/functest-xtesting
+          name: opnfv/xtesting
           projects:
             - name: 'xtesting-opnfv-xtesting-{tag}-gate'
               <<: *xtesting-jobs
@@ -393,6 +416,8 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-fifth-run'
               <<: *xtesting-jobs
+            - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
+              <<: *xtesting-jobs
 
 - project:
     name: 'xtesting'