From 47fda3149de3d0abd9fca45e552cc67129e7d24c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 15 Dec 2019 11:54:26 +0100 Subject: Add buid_tag in Functest jobs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It eases archiving all logs (third-party certification). Change-Id: Ief9c89ac9cf5a748fb8f6965078c9651fd0066ac Signed-off-by: Cédric Ollivier --- jjb/functest/functest-kubernetes.yaml | 19 +++++++++++++++++-- jjb/functest/functest.yaml | 19 +++++++++++++++++-- jjb/functest/xtesting.yaml | 19 +++++++++++++++++-- 3 files changed, 51 insertions(+), 6 deletions(-) (limited to 'jjb/functest') diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml index 12c9c26a1..38f721f3a 100644 --- a/jjb/functest/functest-kubernetes.yaml +++ b/jjb/functest/functest-kubernetes.yaml @@ -28,6 +28,12 @@ name: slave default: '{slave}' +- parameter: + name: functest-kubernetes-build_tag + parameters: + - random-string: + name: build_tag + - parameter: name: functest-kubernetes-branch parameters: @@ -104,8 +110,9 @@ 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 \ + -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 \ + -e BUILD_TAG=$BUILD_TAG \ -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 \ @@ -186,6 +193,8 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' builders: - functest-kubernetes-run-containers: <<: *functest-kubernetes-run-containers @@ -222,6 +231,8 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' properties: - build-blocker: use-build-blocker: true @@ -341,6 +352,8 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' - functest-kubernetes-branch: branch: '{branch}' properties: @@ -428,6 +441,8 @@ parameters: - functest-kubernetes-slave: slave: '{slave}' + - functest-kubernetes-build_tag: + build_tag: '' properties: - build-blocker: use-build-blocker: true diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index feb672c40..61d160569 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -32,6 +32,12 @@ name: slave default: '{slave}' +- parameter: + name: functest-build_tag + parameters: + - random-string: + name: build_tag + - parameter: name: functest-branch parameters: @@ -132,8 +138,9 @@ fi sudo docker run --rm \ -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 \ + -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 \ + -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -e DEBUG=$DEBUG \ -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \ @@ -264,6 +271,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-DEBUG: DEBUG: 'true' - functest-EXTERNAL_NETWORK: @@ -386,6 +395,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-DEBUG: DEBUG: 'true' - functest-EXTERNAL_NETWORK: @@ -659,6 +670,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-branch: branch: '{branch}' - functest-DEBUG: @@ -862,6 +875,8 @@ parameters: - functest-slave: slave: '{slave}' + - functest-build_tag: + build_tag: '' - functest-DEBUG: DEBUG: 'true' - functest-EXTERNAL_NETWORK: diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml index b34fc100c..2cb08727a 100644 --- a/jjb/functest/xtesting.yaml +++ b/jjb/functest/xtesting.yaml @@ -28,6 +28,12 @@ name: slave default: '{slave}' +- parameter: + name: xtesting-build_tag + parameters: + - random-string: + name: build_tag + - parameter: name: xtesting-branch parameters: @@ -104,8 +110,9 @@ fi sudo docker run --rm \ -e S3_ENDPOINT_URL=https://storage.googleapis.com \ - -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \ - -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \ + -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 \ + -e BUILD_TAG=$BUILD_TAG \ -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \ -v /home/opnfv/xtesting/.boto:/root/.boto \ -e DEBUG=true \ @@ -171,6 +178,8 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' builders: - xtesting-run-containers: <<: *xtesting-run-containers @@ -202,6 +211,8 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' properties: - build-blocker: use-build-blocker: true @@ -299,6 +310,8 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' - xtesting-branch: branch: '{branch}' properties: @@ -376,6 +389,8 @@ parameters: - xtesting-slave: slave: '{slave}' + - xtesting-build_tag: + build_tag: '' properties: - build-blocker: use-build-blocker: true -- cgit