X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Ffunctest%2Fxtesting-pi.yaml;h=cf3d2ba05d07c261ac4cf62284291dab1ac8730b;hb=fe86c2e9d8f77c52c2226c231964a775545a262a;hp=2b6e04e1abbed5605c0efdd1ac68bf83e97a9e05;hpb=eda5459bcd2e4772a3f7874c878602977623097c;p=releng.git

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 2b6e04e1a..cf3d2ba05 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -1,7 +1,10 @@
 ---
-- xtesting-pi-jobs: &xtesting-pi-jobs
-    name: 'xtesting-pi-jobs'
-    current-parameters: true
+- xtesting-pi-containers: &xtesting-pi-containers
+    name: 'xtesting-pi-containers'
+    repo: '{repo}'
+    port: '{port}'
+    container: '{container}'
+    tag: '{tag}'
 
 - xtesting-pi-params: &xtesting-pi-params
     name: 'xtesting-pi-params'
@@ -9,57 +12,46 @@
     port:
     tag:
       - latest:
-          branch: master
-          slave: lf-virtual1
-      - kali:
-          branch: stable/kali
-          slave: lf-virtual1
-      - jerma:
-          branch: stable/jerma
-          slave: lf-virtual1
-      - iruya:
-          branch: stable/iruya
-          slave: lf-virtual1
-      - hunter:
-          branch: stable/hunter
-          slave: lf-virtual1
+          node: xtesting
+      - zed:
+          node: xtesting
+      - yoga:
+          node: xtesting
+      - xena:
+          node: xtesting
+      - wallaby:
+          node: xtesting
       - arm-latest:
-          branch: master
-          slave: lf-virtual1
-      - arm-kali:
-          branch: stable/kali
-          slave: lf-virtual1
-      - arm-jerma:
-          branch: stable/jerma
-          slave: lf-virtual1
-      - arm-iruya:
-          branch: stable/iruya
-          slave: lf-virtual1
-      - arm-hunter:
-          branch: stable/hunter
-          slave: lf-virtual1
+          node: xtesting
+      - arm-zed:
+          node: xtesting
+      - arm-yoga:
+          node: xtesting
+      - arm-xena:
+          node: xtesting
+      - arm-wallaby:
+          node: xtesting
       - arm64-latest:
-          branch: master
-          slave: lf-virtual1
-      - arm64-kali:
-          branch: stable/kali
-          slave: lf-virtual1
-      - arm64-jerma:
-          branch: stable/jerma
-          slave: lf-virtual1
-      - arm64-iruya:
-          branch: stable/iruya
-          slave: lf-virtual1
-      - arm64-hunter:
-          branch: stable/hunter
-          slave: lf-virtual1
+          node: xtesting
+      - arm64-zed:
+          node: xtesting
+      - arm64-yoga:
+          node: xtesting
+      - arm64-xena:
+          node: xtesting
+      - arm64-wallaby:
+          node: xtesting
+
+- xtesting-pi-jobs: &xtesting-pi-jobs
+    name: 'xtesting-pi-jobs'
+    current-parameters: true
 
 - parameter:
-    name: xtesting-pi-slave
+    name: xtesting-pi-node
     parameters:
       - label:
-          name: slave
-          default: '{slave}'
+          name: node
+          default: '{node}'
 
 - parameter:
     name: xtesting-pi-build_tag
@@ -67,33 +59,17 @@
       - random-string:
           name: build_tag
 
-- parameter:
-    name: xtesting-pi-branch
-    parameters:
-      - string:
-          name: branch
-          default: '{branch}'
-
-- parameter:
-    name: xtesting-pi-DEBUG
-    parameters:
-      - string:
-          name: DEBUG
-          default: 'true'
-
-- xtesting-pi-containers: &xtesting-pi-containers
-    name: 'xtesting-pi-containers'
-    repo: '{repo}'
-    port: '{port}'
-    container: '{container}'
-    tag: '{tag}'
-
 - xtesting-pi-run-containers: &xtesting-pi-run-containers
     name: 'xtesting-pi-run-containers'
     <<: *xtesting-pi-containers
     test: '{test}'
     privileged: '{privileged}'
+    volumes: '{volumes}'
+    env: '{env}'
     network: '{network}'
+    uid: '{uid}'
+    gid: '{gid}'
+    published_ports: '{published_ports}'
 
 - builder:
     name: xtesting-pi-pull-containers
@@ -114,7 +90,22 @@
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
+          fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -122,19 +113,23 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
             --privileged={privileged} \
             --network={network} \
+            $volumes \
+            $env \
+            $published_ports \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -v /home/opnfv/xtesting/.boto:/etc/boto.cfg \
             -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 NODE_NAME=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEBUG=$DEBUG \
-            -v /home/opnfv/xtesting/.boto:/root/.boto \
             $image run_tests -t {test} -p -r
 
 - builder:
@@ -151,12 +146,11 @@
           fi
           sudo docker rmi $image || true
 
-
 - job-template:
     name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
     builders:
       - xtesting-pi-pull-containers:
           <<: *xtesting-pi-containers
@@ -172,28 +166,14 @@
     name: 'xtesting-pi-ollivier-xtesting-mts-pull'
     <<: *xtesting-pi-params
     container: 'xtesting-mts'
-    exclude:
-      - tag: hunter
-      - tag: iruya
-      - tag: jerma
-      - tag: kali
-      - tag: arm-hunter
-      - tag: arm-iruya
-      - tag: arm-jerma
-      - tag: arm-kali
-      - tag: arm-latest
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
     jobs:
       - 'xtesting-pi-{repo}-{container}-{tag}-pull'
 
 - job-template:
     name: 'xtesting-pi-{repo}-{container}-{tag}-rmi'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
     builders:
       - xtesting-pi-remove-images:
           <<: *xtesting-pi-containers
@@ -209,32 +189,16 @@
     name: 'xtesting-pi-ollivier-xtesting-mts-rmi'
     <<: *xtesting-pi-params
     container: 'xtesting-mts'
-    exclude:
-      - tag: hunter
-      - tag: iruya
-      - tag: jerma
-      - tag: kali
-      - tag: arm-hunter
-      - tag: arm-iruya
-      - tag: arm-jerma
-      - tag: arm-kali
-      - tag: arm-latest
-      - tag: arm64-hunter
-      - tag: arm64-iruya
-      - tag: arm64-jerma
-      - tag: arm64-kali
     jobs:
       - 'xtesting-pi-{repo}-{container}-{tag}-rmi'
 
 - job-template:
-    name: 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
+    name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
       - xtesting-pi-build_tag:
           build_tag: ''
-      - xtesting-pi-DEBUG:
-          DEBUG: 'true'
     builders:
       - xtesting-pi-run-containers:
           <<: *xtesting-pi-run-containers
@@ -242,6 +206,9 @@
 - project:
     name: 'xtesting-pi-ollivier-xtesting'
     <<: *xtesting-pi-params
+    volumes:
+    env:
+    published_ports:
     container: 'xtesting'
     test:
       - first
@@ -250,56 +217,62 @@
       - fourth
       - fifth
       - sixth
+      - eighth
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
+      - 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
+
+- job-template:
+    name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
+    parameters:
+      - xtesting-pi-node:
+          node: '{node}'
+      - xtesting-pi-build_tag:
+          build_tag: ''
+    builders:
+      - xtesting-pi-run-containers:
+          <<: *xtesting-pi-run-containers
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting-mts'
     <<: *xtesting-pi-params
+    volumes:
+    env:
+    published_ports:
     container: 'xtesting-mts'
     test:
       - seventh
-    exclude:
-      - tag: hunter
-        test: seventh
-      - tag: iruya
-        test: seventh
-      - tag: jerma
-        test: seventh
-      - tag: kali
-        test: seventh
-      - tag: arm-hunter
-        test: seventh
-      - tag: arm-iruya
-        test: seventh
-      - tag: arm-jerma
-        test: seventh
-      - tag: arm-kali
-        test: seventh
-      - tag: arm-latest
-        test: seventh
-      - tag: arm64-hunter
-        test: seventh
-      - tag: arm64-iruya
-        test: seventh
-      - tag: arm64-jerma
-        test: seventh
-      - tag: arm64-kali
-        test: seventh
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-{test}-run'
-
+      - 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
 
 - builder:
     name: xtesting-pi-zip
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          volumes=;
+          if [ "{volumes}" != "None" ]; then
+            for i in $(echo {volumes} | tr -d '[]' |sed "s/, / /g" ); \
+              do volumes="-v $i $volumes"; done
+          fi
+          env=;
+          if [ "{env}" != "None" ]; then
+            for i in $(eval echo {env} | tr -d '[]' |sed "s/, / /g" ); \
+              do env="-e $i $env"; done
+          fi
+          published_ports=;
+          if [ "{published_ports}" != "None" ]; then
+            for i in $(echo {published_ports} | tr -d '[]' |sed "s/, / /g" ); \
+              do published_ports="-p $i $published_ports"; done
+          fi
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -307,35 +280,47 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          sudo mkdir -p $WORKSPACE/results
+          sudo chown {uid}:{gid} $WORKSPACE/results
           sudo docker run --rm \
+            $volumes \
+            $env \
+            $published_ports \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
+            -v /home/opnfv/xtesting/.boto:/etc/boto.cfg \
             -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 DEBUG=$DEBUG \
-            -v /home/opnfv/xtesting/.boto:/root/.boto \
             $image zip_campaign
 
 - job-template:
     name: 'xtesting-pi-{tag}-zip'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
       - xtesting-pi-build_tag:
           build_tag: ''
-      - xtesting-pi-DEBUG:
-          DEBUG: 'true'
     builders:
       - xtesting-pi-zip:
           <<: *xtesting-pi-containers
+          volumes: '{volumes}'
+          env: '{env}'
+          uid: '{uid}'
+          gid: '{gid}'
+          published_ports: '{published_ports}'
 
 - project:
     name: 'xtesting-pi-{tag}-zip'
     <<: *xtesting-pi-params
+    volumes:
+    env:
+    published_ports:
     container: 'xtesting'
+    uid: 1000
+    gid: 1000
     jobs:
       - 'xtesting-pi-{tag}-zip'
 
@@ -345,18 +330,18 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
       - xtesting-pi-build_tag:
           build_tag: ''
-      - xtesting-pi-DEBUG:
-          DEBUG: 'true'
+    # PyYAML and yamllint differ here
+    # see https://github.com/yaml/pyyaml/issues/234
+    # yamllint disable rule:indentation
     properties:
       - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
           blocking-jobs:
-            - '^xtesting-pi-{tag}-(daily|check|gate)$'
+          - ^xtesting-(pi-)*{tag}-(daily|docker|review)$
+    # yamllint enable rule:indentation
     builders:
       - multijob:
           name: remove former images
@@ -387,6 +372,8 @@
               <<: *xtesting-pi-jobs
             - name: 'xtesting-pi-ollivier-xtesting-{tag}-sixth-run'
               <<: *xtesting-pi-jobs
+            - name: 'xtesting-pi-ollivier-xtesting-{tag}-eighth-run'
+              <<: *xtesting-pi-jobs
       - multijob:
           name: ollivier/xtesting-mts:{tag}
           projects:
@@ -397,10 +384,15 @@
           projects:
             - name: 'xtesting-pi-{tag}-zip'
               <<: *xtesting-pi-jobs
-
+    publishers:
+      - email-ext:
+          failure: false
+          first-failure: true
+          fixed: true
+          recipients: cedric.ollivier@orange.com
 
 - project:
-    name: 'xtesting-pi'
+    name: 'xtesting-pi-daily'
     <<: *xtesting-pi-params
     jobs:
       - 'xtesting-pi-{tag}-daily'
@@ -415,4 +407,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting-pi-[a-z]+-(daily|check|gate)$
+    regex: ^xtesting-pi-[a-z-0-9.]+-daily$