diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-11-14 20:12:28 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-11-14 20:12:28 +0100 |
| commit | af1f949087ec6d682c46822316b2c2ad2c2d7c6c (patch) | |
| tree | 6b3881390742611c6136e3e919cb9bd445fb6f4b | |
| parent | 2d1656e1df9421811315cc23a54b7fe57f215c17 (diff) | |
Leverage on S3 support provided Xtesting
It avoids using gsutil in Jenkins (extra logics).
Change-Id: I2f3d69b88b115469e25b1452590e9ffc66266455
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | jjb/functest/functest-kubernetes.yaml | 11 | ||||
| -rw-r--r-- | jjb/functest/functest.yaml | 15 |
2 files changed, 10 insertions, 16 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index f235c4db3..fa742184e 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -103,17 +103,14 @@ image={repo}:{port}/{container}:{tag} fi docker run --rm \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \ -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \ + -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \ $image run_tests -t {test} - res=$? - gsutil -m cp -r $WORKSPACE/ \ - gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 - find $WORKSPACE -type f \ - -printf \ - "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n" - exit $res - builder: name: functest-kubernetes-remove-images diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index 0173c99a3..fee9340df 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -98,7 +98,7 @@ name: functest-run-containers builders: - shell: | - set +ex + set +x [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true if [ "{repo}" = "_" ]; then image={container}:{tag} @@ -121,21 +121,18 @@ -e DEBUG=True \ -e EXTERNAL_NETWORK=public \ -e DASHBOARD_URL={dashboard_url} \ + -e S3_ENDPOINT_URL=https://storage.googleapis.com \ + -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ + -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \ -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \ -v /home/opnfv/functest/images:/home/opnfv/functest/images \ -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\ + -v /home/opnfv/functest/.boto:/root/.boto \ site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\ blacklist.yaml \ -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\ site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \ - $image run_tests -t {test} - res=$? - gsutil -m cp -r $WORKSPACE/ \ - gs://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID > /dev/null 2>&1 - find $WORKSPACE -type f \ - -printf \ - "http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID/%P\n" - exit $res + $image run_tests -t {test} -p - builder: name: functest-remove-images |