Reduce disk-image-builder env vars

[releng.git] / jjb / functest / xtesting-pi.yaml

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 5e5438b..f7d5e77 100644 (file)
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -12,35 +12,41 @@
     port:
     tag:
       - latest:
-          node: opnfv-build
+          node: xtesting
+      - 2023.1:
+          node: xtesting
       - zed:
-          node: opnfv-build
+          node: xtesting
       - yoga:
-          node: opnfv-build
+          node: xtesting
       - xena:
-          node: opnfv-build
+          node: xtesting
       - wallaby:
-          node: opnfv-build
+          node: xtesting
       - arm-latest:
-          node: opnfv-build
+          node: xtesting
+      - arm-2.23.1:
+          node: xtesting
       - arm-zed:
-          node: opnfv-build
+          node: xtesting
       - arm-yoga:
-          node: opnfv-build
+          node: xtesting
       - arm-xena:
-          node: opnfv-build
+          node: xtesting
       - arm-wallaby:
-          node: opnfv-build
+          node: xtesting
       - arm64-latest:
-          node: opnfv-build
+          node: xtesting
+      - arm64-2023.1:
+          node: xtesting
       - arm64-zed:
-          node: opnfv-build
+          node: xtesting
       - arm64-yoga:
-          node: opnfv-build
+          node: xtesting
       - arm64-xena:
-          node: opnfv-build
+          node: xtesting
       - arm64-wallaby:
-          node: opnfv-build
+          node: xtesting
 
 - xtesting-pi-jobs: &xtesting-pi-jobs
     name: 'xtesting-pi-jobs'
@@ -124,7 +130,7 @@
             -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 /etc/boto.cfg:/etc/boto.cfg \
+            -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 \
@@ -162,13 +168,6 @@
     jobs:
       - 'xtesting-pi-{repo}-{container}-{tag}-pull'
 
-- project:
-    name: 'xtesting-pi-ollivier-xtesting-mts-pull'
-    <<: *xtesting-pi-params
-    container: 'xtesting-mts'
-    jobs:
-      - 'xtesting-pi-{repo}-{container}-{tag}-pull'
-
 - job-template:
     name: 'xtesting-pi-{repo}-{container}-{tag}-rmi'
     parameters:
@@ -185,13 +184,6 @@
     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'
-
 - job-template:
     name: 'xtesting-pi-ollivier-xtesting-{tag}-{test}-run'
     parameters:
@@ -218,40 +210,19 @@
       - fifth
       - sixth
       - eighth
+      - nineth
     privileged: 'false'
     network: bridge
     uid: 1000
     gid: 1000
+    exclude:
+      - 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-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
-    privileged: 'false'
-    network: bridge
-    uid: 1000
-    gid: 1000
-    jobs:
-      - 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
-
 - builder:
     name: xtesting-pi-zip
     builders:
@@ -289,7 +260,7 @@
             -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 /etc/boto.cfg:/etc/boto.cfg \
+            -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 \
@@ -348,15 +319,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:
@@ -374,10 +341,7 @@
               <<: *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