summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2022-12-13 19:50:16 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2022-12-13 19:50:16 +0100
commit5b4b987d68d6ad0e35bbb247d386ba66c37e66dc (patch)
treea92655685bdf26e8948f9f6da3587e3d4a5d6b77
parent10076a94d789772e73f2d6da6da1729c05dc3950 (diff)
Use common build for containers
Change-Id: I20c2fddd33f030bddaa210a65c8d17e1c8631c48 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--jjb/functest/xtesting-pi.yaml34
-rw-r--r--jjb/functest/xtesting.yaml14
2 files changed, 24 insertions, 24 deletions
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index e00029f68..6b60bcaf2 100644
--- 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 2c1f8cc91..358265f23 100644
--- 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 \