summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-06-29 11:17:31 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-06-29 11:17:31 +0200
commit08358993fcab1ba47dcd2d24a4f99915e6725fcc (patch)
tree10795163eb01508a79da081ad867506b7cd9e052 /jjb
parent6c338b47697e221e6264d7adac20ae75c7485561 (diff)
Update all Functest jjbs
It leverages latest changes from XtestingCI Change-Id: Ic1e5e6bd95ff18a91855d4cdff38a1f4611f123e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb')
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml120
-rw-r--r--jjb/functest/functest-kubernetes.yaml120
-rw-r--r--jjb/functest/functest-pi.yaml170
-rw-r--r--jjb/functest/functest.yaml170
-rw-r--r--jjb/functest/xtesting-pi.yaml35
-rw-r--r--jjb/functest/xtesting.yaml35
6 files changed, 586 insertions, 64 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 087c83d39..986ea58d5 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -72,6 +72,8 @@
<<: *functest-kubernetes-pi-containers
test: '{test}'
privileged: '{privileged}'
+ volumes: '{volumes}'
+ env: '{env}'
network: '{network}'
- builder:
@@ -93,6 +95,8 @@
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -104,6 +108,8 @@
docker run --rm \
--privileged={privileged} \
--network={network} \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -113,9 +119,6 @@
-e NODE_NAME=$slave \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
- -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
- -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
- -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image run_tests -t {test} -p -r
- builder:
@@ -221,7 +224,7 @@
- 'functest-kubernetes-pi-{repo}-{container}-{tag}-rmi'
- job-template:
- name: 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-{test}-run'
parameters:
- functest-kubernetes-pi-slave:
slave: '{slave}'
@@ -238,6 +241,11 @@
- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck'
<<: *functest-kubernetes-pi-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-healthcheck'
test:
- k8s_quick
@@ -245,11 +253,31 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-pi-ollivier-functest-kubernetes-healthcheck-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-pi-slave:
+ slave: '{slave}'
+ - functest-kubernetes-pi-build_tag:
+ build_tag: ''
+ - functest-kubernetes-pi-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-pi-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-pi-run-containers:
+ <<: *functest-kubernetes-pi-run-containers
- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke'
<<: *functest-kubernetes-pi-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-smoke'
test:
- xrally_kubernetes
@@ -289,11 +317,31 @@
- tag: arm64-v1.21
test: k8s_io
jobs:
- - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-pi-ollivier-functest-kubernetes-smoke-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-pi-slave:
+ slave: '{slave}'
+ - functest-kubernetes-pi-build_tag:
+ build_tag: ''
+ - functest-kubernetes-pi-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-pi-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-pi-run-containers:
+ <<: *functest-kubernetes-pi-run-containers
- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-security'
<<: *functest-kubernetes-pi-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-security'
test:
- kube_hunter
@@ -302,11 +350,31 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-pi-ollivier-functest-kubernetes-security-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-pi-slave:
+ slave: '{slave}'
+ - functest-kubernetes-pi-build_tag:
+ build_tag: ''
+ - functest-kubernetes-pi-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-pi-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-pi-run-containers:
+ <<: *functest-kubernetes-pi-run-containers
- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking'
<<: *functest-kubernetes-pi-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-benchmarking'
test:
- xrally_kubernetes_full
@@ -314,11 +382,31 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-pi-ollivier-functest-kubernetes-benchmarking-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-pi-slave:
+ slave: '{slave}'
+ - functest-kubernetes-pi-build_tag:
+ build_tag: ''
+ - functest-kubernetes-pi-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-pi-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-pi-run-containers:
+ <<: *functest-kubernetes-pi-run-containers
- project:
name: 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf'
<<: *functest-kubernetes-pi-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-cnf'
test:
- k8s_vims
@@ -327,13 +415,15 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-pi-ollivier-functest-kubernetes-cnf-{tag}-{test}-run'
- builder:
name: functest-kubernetes-pi-zip
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -343,6 +433,8 @@
image={repo}:{port}/{container}:{tag}
fi
docker run --rm \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
@@ -351,9 +443,6 @@
-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 DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
- -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
- -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image zip_campaign
- job-template:
@@ -370,10 +459,17 @@
builders:
- functest-kubernetes-pi-zip:
<<: *functest-kubernetes-pi-containers
+ volumes: '{volumes}'
+ env: '{env}'
- project:
name: 'functest-kubernetes-pi-{tag}-zip'
<<: *functest-kubernetes-pi-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-healthcheck'
jobs:
- 'functest-kubernetes-pi-{tag}-zip'
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index b84514969..a42784ab3 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -72,6 +72,8 @@
<<: *functest-kubernetes-containers
test: '{test}'
privileged: '{privileged}'
+ volumes: '{volumes}'
+ env: '{env}'
network: '{network}'
- builder:
@@ -93,6 +95,8 @@
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -104,6 +108,8 @@
docker run --rm \
--privileged={privileged} \
--network={network} \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -113,9 +119,6 @@
-e NODE_NAME=$slave \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
- -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
- -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
- -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image run_tests -t {test} -p -r
- builder:
@@ -221,7 +224,7 @@
- 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
- job-template:
- name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
parameters:
- functest-kubernetes-slave:
slave: '{slave}'
@@ -238,6 +241,11 @@
- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck'
<<: *functest-kubernetes-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-healthcheck'
test:
- k8s_quick
@@ -245,11 +253,31 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-opnfv-functest-kubernetes-healthcheck-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-slave:
+ slave: '{slave}'
+ - functest-kubernetes-build_tag:
+ build_tag: ''
+ - functest-kubernetes-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-run-containers:
+ <<: *functest-kubernetes-run-containers
- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke'
<<: *functest-kubernetes-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-smoke'
test:
- xrally_kubernetes
@@ -279,11 +307,31 @@
- tag: v1.21
test: k8s_io
jobs:
- - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-slave:
+ slave: '{slave}'
+ - functest-kubernetes-build_tag:
+ build_tag: ''
+ - functest-kubernetes-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-run-containers:
+ <<: *functest-kubernetes-run-containers
- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-security'
<<: *functest-kubernetes-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-security'
test:
- kube_hunter
@@ -292,11 +340,31 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-opnfv-functest-kubernetes-security-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-slave:
+ slave: '{slave}'
+ - functest-kubernetes-build_tag:
+ build_tag: ''
+ - functest-kubernetes-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-run-containers:
+ <<: *functest-kubernetes-run-containers
- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking'
<<: *functest-kubernetes-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-benchmarking'
test:
- xrally_kubernetes_full
@@ -304,11 +372,31 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-opnfv-functest-kubernetes-benchmarking-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
+ parameters:
+ - functest-kubernetes-slave:
+ slave: '{slave}'
+ - functest-kubernetes-build_tag:
+ build_tag: ''
+ - functest-kubernetes-DEPLOY_SCENARIO:
+ DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
+ builders:
+ - functest-kubernetes-run-containers:
+ <<: *functest-kubernetes-run-containers
- project:
name: 'functest-kubernetes-opnfv-functest-kubernetes-cnf'
<<: *functest-kubernetes-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-cnf'
test:
- k8s_vims
@@ -317,13 +405,15 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-kubernetes-opnfv-functest-kubernetes-cnf-{tag}-{test}-run'
- builder:
name: functest-kubernetes-zip
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -333,6 +423,8 @@
image={repo}:{port}/{container}:{tag}
fi
docker run --rm \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
@@ -341,9 +433,6 @@
-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 DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
- -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
- -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image zip_campaign
- job-template:
@@ -360,10 +449,17 @@
builders:
- functest-kubernetes-zip:
<<: *functest-kubernetes-containers
+ volumes: '{volumes}'
+ env: '{env}'
- project:
name: 'functest-kubernetes-{tag}-zip'
<<: *functest-kubernetes-params
+ volumes:
+ - /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config
+ env:
+ - DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+ - E2E_TEST_OPTS=$E2E_TEST_OPTS
container: 'functest-kubernetes-healthcheck'
jobs:
- 'functest-kubernetes-{tag}-zip'
diff --git a/jjb/functest/functest-pi.yaml b/jjb/functest/functest-pi.yaml
index 27b467270..663810ce0 100644
--- a/jjb/functest/functest-pi.yaml
+++ b/jjb/functest/functest-pi.yaml
@@ -100,6 +100,8 @@
<<: *functest-pi-containers
test: '{test}'
privileged: '{privileged}'
+ volumes: '{volumes}'
+ env: '{env}'
network: '{network}'
DASHBOARD_URL: '{DASHBOARD_URL}'
@@ -122,6 +124,8 @@
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -133,6 +137,8 @@
sudo docker run --rm \
--privileged={privileged} \
--network={network} \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -142,12 +148,7 @@
-e NODE_NAME=$slave \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
- -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
- -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
- -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
-e DASHBOARD_URL={DASHBOARD_URL} \
- -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
- -v /home/opnfv/functest/images:/home/opnfv/functest/images \
$image run_tests -t {test} -p -r
- builder:
@@ -267,7 +268,7 @@
- 'functest-pi-{repo}-{container}-{tag}-rmi'
- job-template:
- name: 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+ name: 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run'
parameters:
- functest-pi-slave:
slave: '{slave}'
@@ -286,6 +287,13 @@
- project:
name: 'functest-pi-ollivier-functest-healthcheck'
<<: *functest-pi-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-healthcheck'
test:
- connection_check
@@ -304,11 +312,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-pi-ollivier-functest-healthcheck-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-pi-ollivier-functest-smoke-{tag}-{test}-run'
+ parameters:
+ - functest-pi-slave:
+ slave: '{slave}'
+ - functest-pi-build_tag:
+ build_tag: ''
+ - functest-pi-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-pi-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-pi-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-pi-run-containers:
+ <<: *functest-pi-run-containers
- project:
name: 'functest-pi-ollivier-functest-smoke'
<<: *functest-pi-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-smoke'
test:
- tempest_neutron
@@ -487,11 +519,35 @@
- tag: arm64-jerma
test: tempest_cyborg
jobs:
- - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-pi-ollivier-functest-smoke-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-pi-ollivier-functest-smoke-cntt-{tag}-{test}-run'
+ parameters:
+ - functest-pi-slave:
+ slave: '{slave}'
+ - functest-pi-build_tag:
+ build_tag: ''
+ - functest-pi-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-pi-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-pi-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-pi-run-containers:
+ <<: *functest-pi-run-containers
- project:
name: 'functest-pi-ollivier-functest-smoke-cntt'
<<: *functest-pi-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-smoke-cntt'
test:
- tempest_neutron_cntt
@@ -505,11 +561,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-pi-ollivier-functest-smoke-cntt-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-pi-ollivier-functest-benchmarking-{tag}-{test}-run'
+ parameters:
+ - functest-pi-slave:
+ slave: '{slave}'
+ - functest-pi-build_tag:
+ build_tag: ''
+ - functest-pi-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-pi-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-pi-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-pi-run-containers:
+ <<: *functest-pi-run-containers
- project:
name: 'functest-pi-ollivier-functest-benchmarking'
<<: *functest-pi-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-benchmarking'
test:
- rally_full
@@ -519,11 +599,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-pi-ollivier-functest-benchmarking-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-{test}-run'
+ parameters:
+ - functest-pi-slave:
+ slave: '{slave}'
+ - functest-pi-build_tag:
+ build_tag: ''
+ - functest-pi-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-pi-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-pi-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-pi-run-containers:
+ <<: *functest-pi-run-containers
- project:
name: 'functest-pi-ollivier-functest-benchmarking-cntt'
<<: *functest-pi-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-benchmarking-cntt'
test:
- rally_full_cntt
@@ -531,11 +635,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-pi-ollivier-functest-benchmarking-cntt-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run'
+ parameters:
+ - functest-pi-slave:
+ slave: '{slave}'
+ - functest-pi-build_tag:
+ build_tag: ''
+ - functest-pi-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-pi-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-pi-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-pi-run-containers:
+ <<: *functest-pi-run-containers
- project:
name: 'functest-pi-ollivier-functest-vnf'
<<: *functest-pi-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-vnf'
test:
- cloudify
@@ -546,13 +674,15 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-pi-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-pi-ollivier-functest-vnf-{tag}-{test}-run'
- builder:
name: functest-pi-zip
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -562,6 +692,8 @@
image={repo}:{port}/{container}:{tag}
fi
sudo docker run --rm \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest \
@@ -570,11 +702,6 @@
-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 EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
- -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
- -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
- -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
- -v /home/opnfv/functest/images:/home/opnfv/functest/images \
$image zip_campaign
- job-template:
@@ -593,10 +720,19 @@
builders:
- functest-pi-zip:
<<: *functest-pi-containers
+ volumes: '{volumes}'
+ env: '{env}'
- project:
name: 'functest-pi-{tag}-zip'
<<: *functest-pi-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-healthcheck'
jobs:
- 'functest-pi-{tag}-zip'
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 09494e732..e9086f07d 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -90,6 +90,8 @@
<<: *functest-containers
test: '{test}'
privileged: '{privileged}'
+ volumes: '{volumes}'
+ env: '{env}'
network: '{network}'
DASHBOARD_URL: '{DASHBOARD_URL}'
@@ -112,6 +114,8 @@
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -123,6 +127,8 @@
sudo docker run --rm \
--privileged={privileged} \
--network={network} \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
@@ -132,12 +138,7 @@
-e NODE_NAME=$slave \
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
- -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
- -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
- -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
-e DASHBOARD_URL={DASHBOARD_URL} \
- -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
- -v /home/opnfv/functest/images:/home/opnfv/functest/images \
$image run_tests -t {test} -p -r
- builder:
@@ -257,7 +258,7 @@
- 'functest-{repo}-{container}-{tag}-rmi'
- job-template:
- name: 'functest-{repo}-{container}-{tag}-{test}-run'
+ name: 'functest-opnfv-functest-healthcheck-{tag}-{test}-run'
parameters:
- functest-slave:
slave: '{slave}'
@@ -276,6 +277,13 @@
- project:
name: 'functest-opnfv-functest-healthcheck'
<<: *functest-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-healthcheck'
test:
- connection_check
@@ -294,11 +302,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-opnfv-functest-healthcheck-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-opnfv-functest-smoke-{tag}-{test}-run'
+ parameters:
+ - functest-slave:
+ slave: '{slave}'
+ - functest-build_tag:
+ build_tag: ''
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-run-containers:
+ <<: *functest-run-containers
- project:
name: 'functest-opnfv-functest-smoke'
<<: *functest-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-smoke'
test:
- tempest_neutron
@@ -377,11 +409,35 @@
- tag: jerma
test: tempest_cyborg
jobs:
- - 'functest-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-opnfv-functest-smoke-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-opnfv-functest-smoke-cntt-{tag}-{test}-run'
+ parameters:
+ - functest-slave:
+ slave: '{slave}'
+ - functest-build_tag:
+ build_tag: ''
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-run-containers:
+ <<: *functest-run-containers
- project:
name: 'functest-opnfv-functest-smoke-cntt'
<<: *functest-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-smoke-cntt'
test:
- tempest_neutron_cntt
@@ -395,11 +451,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-opnfv-functest-smoke-cntt-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-opnfv-functest-benchmarking-{tag}-{test}-run'
+ parameters:
+ - functest-slave:
+ slave: '{slave}'
+ - functest-build_tag:
+ build_tag: ''
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-run-containers:
+ <<: *functest-run-containers
- project:
name: 'functest-opnfv-functest-benchmarking'
<<: *functest-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-benchmarking'
test:
- rally_full
@@ -409,11 +489,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-opnfv-functest-benchmarking-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-opnfv-functest-benchmarking-cntt-{tag}-{test}-run'
+ parameters:
+ - functest-slave:
+ slave: '{slave}'
+ - functest-build_tag:
+ build_tag: ''
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-run-containers:
+ <<: *functest-run-containers
- project:
name: 'functest-opnfv-functest-benchmarking-cntt'
<<: *functest-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-benchmarking-cntt'
test:
- rally_full_cntt
@@ -421,11 +525,35 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-opnfv-functest-benchmarking-cntt-{tag}-{test}-run'
+
+- job-template:
+ name: 'functest-opnfv-functest-vnf-{tag}-{test}-run'
+ parameters:
+ - functest-slave:
+ slave: '{slave}'
+ - functest-build_tag:
+ build_tag: ''
+ - functest-EXTERNAL_NETWORK:
+ EXTERNAL_NETWORK: public
+ - functest-VOLUME_DEVICE_NAME:
+ VOLUME_DEVICE_NAME: sdb
+ - functest-IMAGE_PROPERTIES:
+ IMAGE_PROPERTIES: hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
+ builders:
+ - functest-run-containers:
+ <<: *functest-run-containers
- project:
name: 'functest-opnfv-functest-vnf'
<<: *functest-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-vnf'
test:
- cloudify
@@ -436,13 +564,15 @@
privileged: 'false'
network: bridge
jobs:
- - 'functest-{repo}-{container}-{tag}-{test}-run'
+ - 'functest-opnfv-functest-vnf-{tag}-{test}-run'
- builder:
name: functest-zip
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -452,6 +582,8 @@
image={repo}:{port}/{container}:{tag}
fi
sudo docker run --rm \
+ $volumes \
+ $env \
-e S3_ENDPOINT_URL=https://storage.googleapis.com \
-e S3_DST_URL=s3://artifacts.opnfv.org/functest \
-e HTTP_DST_URL=http://artifacts.opnfv.org/functest \
@@ -460,11 +592,6 @@
-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 EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
- -e VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME \
- -e IMAGE_PROPERTIES=$IMAGE_PROPERTIES \
- -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
- -v /home/opnfv/functest/images:/home/opnfv/functest/images \
$image zip_campaign
- job-template:
@@ -483,10 +610,19 @@
builders:
- functest-zip:
<<: *functest-containers
+ volumes: '{volumes}'
+ env: '{env}'
- project:
name: 'functest-{tag}-zip'
<<: *functest-params
+ volumes:
+ - /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file
+ - /home/opnfv/functest/images:/home/opnfv/functest/images
+ env:
+ - EXTERNAL_NETWORK=$EXTERNAL_NETWORK
+ - VOLUME_DEVICE_NAME=$VOLUME_DEVICE_NAME
+ - IMAGE_PROPERTIES=$IMAGE_PROPERTIES
container: 'functest-healthcheck'
jobs:
- 'functest-{tag}-zip'
diff --git a/jjb/functest/xtesting-pi.yaml b/jjb/functest/xtesting-pi.yaml
index 611c68d09..7ecc02ed9 100644
--- a/jjb/functest/xtesting-pi.yaml
+++ b/jjb/functest/xtesting-pi.yaml
@@ -64,6 +64,8 @@
<<: *xtesting-pi-containers
test: '{test}'
privileged: '{privileged}'
+ volumes: '{volumes}'
+ env: '{env}'
network: '{network}'
- builder:
@@ -85,6 +87,8 @@
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -96,6 +100,8 @@
sudo docker run --rm \
--privileged={privileged} \
--network={network} \
+ $volumes \
+ $env \
-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 \
@@ -168,7 +174,7 @@
- '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}'
@@ -181,6 +187,8 @@
- project:
name: 'xtesting-pi-ollivier-xtesting'
<<: *xtesting-pi-params
+ volumes:
+ env:
container: 'xtesting'
test:
- first
@@ -212,24 +220,39 @@
- tag: arm64-jerma
test: eighth
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-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-{repo}-{container}-{tag}-{test}-run'
+ - 'xtesting-pi-ollivier-xtesting-mts-{tag}-{test}-run'
- builder:
name: xtesting-pi-zip
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -239,6 +262,8 @@
image={repo}:{port}/{container}:{tag}
fi
sudo docker run --rm \
+ $volumes \
+ $env \
-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 \
@@ -259,10 +284,14 @@
builders:
- xtesting-pi-zip:
<<: *xtesting-pi-containers
+ volumes: '{volumes}'
+ env: '{env}'
- project:
name: 'xtesting-pi-{tag}-zip'
<<: *xtesting-pi-params
+ volumes:
+ env:
container: 'xtesting'
jobs:
- 'xtesting-pi-{tag}-zip'
diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index 1565739dc..389cfd0e7 100644
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -64,6 +64,8 @@
<<: *xtesting-containers
test: '{test}'
privileged: '{privileged}'
+ volumes: '{volumes}'
+ env: '{env}'
network: '{network}'
- builder:
@@ -85,6 +87,8 @@
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -96,6 +100,8 @@
sudo docker run --rm \
--privileged={privileged} \
--network={network} \
+ $volumes \
+ $env \
-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 \
@@ -168,7 +174,7 @@
- 'xtesting-{repo}-{container}-{tag}-rmi'
- job-template:
- name: 'xtesting-{repo}-{container}-{tag}-{test}-run'
+ name: 'xtesting-opnfv-xtesting-{tag}-{test}-run'
parameters:
- xtesting-slave:
slave: '{slave}'
@@ -181,6 +187,8 @@
- project:
name: 'xtesting-opnfv-xtesting'
<<: *xtesting-params
+ volumes:
+ env:
container: 'xtesting'
test:
- first
@@ -200,24 +208,39 @@
- tag: jerma
test: eighth
jobs:
- - 'xtesting-{repo}-{container}-{tag}-{test}-run'
+ - 'xtesting-opnfv-xtesting-{tag}-{test}-run'
+
+- job-template:
+ name: 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
+ parameters:
+ - xtesting-slave:
+ slave: '{slave}'
+ - xtesting-build_tag:
+ build_tag: ''
+ builders:
+ - xtesting-run-containers:
+ <<: *xtesting-run-containers
- project:
name: 'xtesting-opnfv-xtesting-mts'
<<: *xtesting-params
+ volumes:
+ env:
container: 'xtesting-mts'
test:
- seventh
privileged: 'false'
network: bridge
jobs:
- - 'xtesting-{repo}-{container}-{tag}-{test}-run'
+ - 'xtesting-opnfv-xtesting-mts-{tag}-{test}-run'
- builder:
name: xtesting-zip
builders:
- shell: |
set +x
+ volumes=; for i in $(echo {volumes} | tr -d '[] ' |sed "s/,/ /g" ); do volumes="-v $i $volumes"; done
+ env=; for i in $(eval echo {env} | tr -d '[] ' |sed "s/,/ /g" ); do env="-e $i $env"; done
[ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/results || true
if [ "{repo}" = "_" ]; then
image={container}:{tag}
@@ -227,6 +250,8 @@
image={repo}:{port}/{container}:{tag}
fi
sudo docker run --rm \
+ $volumes \
+ $env \
-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 \
@@ -247,10 +272,14 @@
builders:
- xtesting-zip:
<<: *xtesting-containers
+ volumes: '{volumes}'
+ env: '{env}'
- project:
name: 'xtesting-{tag}-zip'
<<: *xtesting-params
+ volumes:
+ env:
container: 'xtesting'
jobs:
- 'xtesting-{tag}-zip'