Use common build for containers

Change-Id: I20c2fddd33f030bddaa210a65c8d17e1c8631c48
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index e00029f..6b60bca 100644 (file)
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -12,35 +12,35 @@
     port:
     tag:
       - latest:
-          slave: lf-virtual1
+          slave: opnfv-build
       - zed:
-          slave: lf-virtual1
+          slave: opnfv-build
       - yoga:
-          slave: lf-virtual1
+          slave: opnfv-build
       - xena:
-          slave: lf-virtual1
+          slave: opnfv-build
       - wallaby:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm-latest:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm-zed:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm-yoga:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm-xena:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm-wallaby:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm64-latest:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm64-zed:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm64-yoga:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm64-xena:
-          slave: lf-virtual1
+          slave: opnfv-build
       - arm64-wallaby:
-          slave: lf-virtual1
+          slave: opnfv-build
 
 - xtesting-pi-jobs: &xtesting-pi-jobs
     name: 'xtesting-pi-jobs'
@@ -124,7 +124,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 /home/opnfv/xtesting/.boto:/etc/boto.cfg \
+            -v /etc/boto.cfg:/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 \
@@ -289,7 +289,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 /home/opnfv/xtesting/.boto:/etc/boto.cfg \
+            -v /etc/boto.cfg:/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 \

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 2c1f8cc..358265f 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -15,31 +15,31 @@
           from:
           build_args:
           branch: master
-          slave: lf-virtual1
+          slave: opnfv-build
           dependency: 3.16
       - zed:
           from:
           build_args:
           branch: stable/zed
-          slave: lf-virtual1
+          slave: opnfv-build
           dependency: 3.16
       - yoga:
           from:
           build_args:
           branch: stable/yoga
-          slave: lf-virtual1
+          slave: opnfv-build
           dependency: 3.16
       - xena:
           from:
           build_args:
           branch: stable/xena
-          slave: lf-virtual1
+          slave: opnfv-build
           dependency: 3.14
       - wallaby:
           from:
           build_args:
           branch: stable/wallaby
-          slave: lf-virtual1
+          slave: opnfv-build
           dependency: 3.13
 
 - xtesting-jobs: &xtesting-jobs
@@ -124,7 +124,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 /home/opnfv/xtesting/.boto:/etc/boto.cfg \
+            -v /etc/boto.cfg:/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 \
@@ -289,7 +289,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 /home/opnfv/xtesting/.boto:/etc/boto.cfg \
+            -v /etc/boto.cfg:/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 \