Add BUILD_TAG in url prefix

It eases collecting the results for third-party compliance/conformance.

Change-Id: I36fa7c60815de8090a234f32d696d24870465252
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index a4dde2b..9a3a0e7 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -81,8 +81,8 @@
           fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/airship/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -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 \

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index c2abc81..f39ea42 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -81,8 +81,8 @@
           fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/cntt/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -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 \