X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting-pi.yaml;h=ecb3cdca46dbc668952ee05a1f84fb9934563f43;hb=94894ae211bd21a309c46a7eb3c86118ae78b673;hp=a8d55c059183103adcad48a70f459c45674359e0;hpb=76d3a4640f0ed4317367b9fbc8f2228558cc752e;p=releng.git

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index a8d55c059..ecb3cdca4 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -8,50 +8,97 @@
 
 - xtesting-pi-params: &xtesting-pi-params
     name: 'xtesting-pi-params'
+    tag:
+      - latest:
+          node: opnfv-build
+      - 2023.1:
+          node: opnfv-build
+      - zed:
+          node: opnfv-build
+      - yoga:
+          node: opnfv-build
+      - xena:
+          node: opnfv-build
+      - wallaby:
+          node: opnfv-build
+      - arm-latest:
+          node: opnfv-build
+      - arm-2.23.1:
+          node: opnfv-build
+      - arm-zed:
+          node: opnfv-build
+      - arm-yoga:
+          node: opnfv-build
+      - arm-xena:
+          node: opnfv-build
+      - arm-wallaby:
+          node: opnfv-build
+      - arm64-latest:
+          node: opnfv-build
+      - arm64-2023.1:
+          node: opnfv-build
+      - arm64-zed:
+          node: opnfv-build
+      - arm64-yoga:
+          node: opnfv-build
+      - arm64-xena:
+          node: opnfv-build
+      - arm64-wallaby:
+          node: opnfv-build
+
+- xtesting-pi-ollivier-xtesting-params: &xtesting-pi-ollivier-xtesting-params
+    name: 'xtesting-pi-ollivier-xtesting-params'
     repo: 'ollivier'
+    container: 'xtesting'
     port:
     tag:
       - latest:
-          slave: lf-virtual1
+          node: opnfv-build
+      - 2023.1:
+          node: opnfv-build
+      - zed:
+          node: opnfv-build
+      - yoga:
+          node: opnfv-build
+      - xena:
+          node: opnfv-build
       - wallaby:
-          slave: lf-virtual1
-      - leguer:
-          slave: lf-virtual1
-      - kali:
-          slave: lf-virtual1
-      - jerma:
-          slave: lf-virtual1
+          node: opnfv-build
       - arm-latest:
-          slave: lf-virtual1
+          node: opnfv-build
+      - arm-2.23.1:
+          node: opnfv-build
+      - arm-zed:
+          node: opnfv-build
+      - arm-yoga:
+          node: opnfv-build
+      - arm-xena:
+          node: opnfv-build
       - arm-wallaby:
-          slave: lf-virtual1
-      - arm-leguer:
-          slave: lf-virtual1
-      - arm-kali:
-          slave: lf-virtual1
-      - arm-jerma:
-          slave: lf-virtual1
+          node: opnfv-build
       - arm64-latest:
-          slave: lf-virtual1
+          node: opnfv-build
+      - arm64-2023.1:
+          node: opnfv-build
+      - arm64-zed:
+          node: opnfv-build
+      - arm64-yoga:
+          node: opnfv-build
+      - arm64-xena:
+          node: opnfv-build
       - arm64-wallaby:
-          slave: lf-virtual1
-      - arm64-leguer:
-          slave: lf-virtual1
-      - arm64-kali:
-          slave: lf-virtual1
-      - arm64-jerma:
-          slave: lf-virtual1
+          node: opnfv-build
 
 - 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
@@ -62,11 +109,13 @@
 - 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
@@ -89,11 +138,18 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -103,18 +159,21 @@
           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:/root/.boto \
+            -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 \
             $image run_tests -t {test} -p -r
@@ -134,67 +193,53 @@
           sudo docker rmi $image || true
 
 - job-template:
-    name: 'xtesting-pi-{repo}-{container}-{tag}-pull'
+    name: 'xtesting-pi-ollivier-xtesting-{tag}-pull'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
     builders:
       - xtesting-pi-pull-containers:
           <<: *xtesting-pi-containers
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting-pull'
-    <<: *xtesting-pi-params
-    container: 'xtesting'
-    jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-pull'
-
-- project:
-    name: 'xtesting-pi-ollivier-xtesting-mts-pull'
-    <<: *xtesting-pi-params
-    container: 'xtesting-mts'
+    <<: *xtesting-pi-ollivier-xtesting-params
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-pull'
+      - 'xtesting-pi-ollivier-xtesting-{tag}-pull'
 
 - job-template:
-    name: 'xtesting-pi-{repo}-{container}-{tag}-rmi'
+    name: 'xtesting-pi-ollivier-xtesting-{tag}-rmi'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
     builders:
       - xtesting-pi-remove-images:
           <<: *xtesting-pi-containers
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting-rmi'
-    <<: *xtesting-pi-params
-    container: 'xtesting'
+    <<: *xtesting-pi-ollivier-xtesting-params
     jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-rmi'
-
-- project:
-    name: 'xtesting-pi-ollivier-xtesting-mts-rmi'
-    <<: *xtesting-pi-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-rmi'
+      - 'xtesting-pi-ollivier-xtesting-{tag}-rmi'
 
 - job-template:
     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: ''
     builders:
       - xtesting-pi-run-containers:
           <<: *xtesting-pi-run-containers
+          test: '{test}'
 
 - project:
     name: 'xtesting-pi-ollivier-xtesting'
-    <<: *xtesting-pi-params
+    <<: *xtesting-pi-ollivier-xtesting-params
     volumes:
     env:
+    published_ports:
     container: 'xtesting'
     test:
       - first
@@ -204,54 +249,19 @@
       - fifth
       - sixth
       - eighth
+      - nineth
     privileged: 'false'
     network: bridge
+    uid: 1000
+    gid: 1000
     exclude:
-      - tag: leguer
-        test: eighth
-      - tag: kali
-        test: eighth
-      - tag: jerma
-        test: eighth
-      - tag: arm-leguer
-        test: eighth
-      - tag: arm-kali
-        test: eighth
-      - tag: arm-jerma
-        test: eighth
-      - tag: arm64-leguer
-        test: eighth
-      - tag: arm64-kali
-        test: eighth
-      - tag: arm64-jerma
-        test: eighth
+      - tag: wallaby
+        test: nineth
+      - tag: xena
+        test: nineth
     jobs:
       - 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
 
-- job-template:
-    name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
-    parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
-      - 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:
-    container: 'xtesting-mts'
-    test:
-      - seventh
-    privileged: 'false'
-    network: bridge
-    jobs:
-      - 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
-
 - builder:
     name: xtesting-pi-zip
     builders:
@@ -259,11 +269,18 @@
           set +x
           volumes=;
           if [ "{volumes}" != "None" ]; then
-            for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+            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
+            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
@@ -273,15 +290,21 @@
           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 \
             -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
-            -v /home/opnfv/xtesting/.boto:/root/.boto \
+            -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=$node \
             -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             $image zip_campaign
@@ -289,22 +312,25 @@
 - job-template:
     name: 'xtesting-pi-{tag}-zip'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
       - xtesting-pi-build_tag:
           build_tag: ''
     builders:
       - xtesting-pi-zip:
-          <<: *xtesting-pi-containers
-          volumes: '{volumes}'
-          env: '{env}'
+          <<: *xtesting-pi-run-containers
 
 - project:
     name: 'xtesting-pi-{tag}-zip'
-    <<: *xtesting-pi-params
+    <<: *xtesting-pi-ollivier-xtesting-params
     volumes:
     env:
+    published_ports:
     container: 'xtesting'
+    privileged: 'false'
+    network: bridge
+    uid: 1000
+    gid: 1000
     jobs:
       - 'xtesting-pi-{tag}-zip'
 
@@ -314,8 +340,8 @@
     triggers:
       - timed: '@daily'
     parameters:
-      - xtesting-pi-slave:
-          slave: '{slave}'
+      - xtesting-pi-node:
+          node: '{node}'
       - xtesting-pi-build_tag:
           build_tag: ''
     # PyYAML and yamllint differ here
@@ -332,15 +358,11 @@
           projects:
             - name: 'xtesting-pi-ollivier-xtesting-{tag}-rmi'
               <<: *xtesting-pi-jobs
-            - name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-rmi'
-              <<: *xtesting-pi-jobs
       - multijob:
           name: pull containers
           projects:
             - name: 'xtesting-pi-ollivier-xtesting-{tag}-pull'
               <<: *xtesting-pi-jobs
-            - name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-pull'
-              <<: *xtesting-pi-jobs
       - multijob:
           name: ollivier/xtesting:{tag}
           projects:
@@ -358,16 +380,19 @@
               <<: *xtesting-pi-jobs
             - name: 'xtesting-pi-ollivier-xtesting-{tag}-eighth-run'
               <<: *xtesting-pi-jobs
-      - multijob:
-          name: ollivier/xtesting-mts:{tag}
-          projects:
-            - name: 'xtesting-pi-ollivier-xtesting-mts-{tag}-seventh-run'
+            - name: 'xtesting-pi-ollivier-xtesting-{tag}-nineth-run'
               <<: *xtesting-pi-jobs
       - multijob:
           name: dump all campaign data
           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-daily'