diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-06-29 11:17:31 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2021-06-29 11:17:31 +0200 |
commit | 08358993fcab1ba47dcd2d24a4f99915e6725fcc (patch) | |
tree | 10795163eb01508a79da081ad867506b7cd9e052 /jjb/functest/xtesting-pi.yaml | |
parent | 6c338b47697e221e6264d7adac20ae75c7485561 (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/functest/xtesting-pi.yaml')
-rw-r--r-- | jjb/functest/xtesting-pi.yaml | 35 |
1 files changed, 32 insertions, 3 deletions
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' |