Add buid_tag in Airship and CNTT jobs

It eases archiving all logs (third-party certification).

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

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index c568912..3f68ffa 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -20,6 +20,12 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: airship-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: airship-DEBUG
     parameters:
@@ -81,6 +87,7 @@
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e NODE_NAME=$slave \
             -e INSTALLER_TYPE=airship \
+            -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -v /home/opnfv/functest/.boto:/root/.boto \
             -e DEBUG=$DEBUG \
@@ -240,6 +247,8 @@
     parameters:
       - airship-slave:
           slave: '{slave}'
+      - airship-build_tag:
+          build_tag: ''
       - airship-DEBUG:
           DEBUG: 'true'
       - airship-EXTERNAL_NETWORK:
@@ -319,6 +328,8 @@
     parameters:
       - airship-slave:
           slave: '{slave}'
+      - airship-build_tag:
+          build_tag: ''
       - airship-branch:
           branch: 'master'
       - airship-DEBUG:
@@ -471,6 +482,8 @@
     parameters:
       - airship-slave:
           slave: '{slave}'
+      - airship-build_tag:
+          build_tag: ''
       - airship-DEBUG:
           DEBUG: 'true'
       - airship-EXTERNAL_NETWORK:

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 5df259d..dfb65e5 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -20,6 +20,12 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: cntt-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: cntt-DEBUG
     parameters:
@@ -81,6 +87,7 @@
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e NODE_NAME=$slave \
             -e INSTALLER_TYPE=cntt \
+            -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -v /home/opnfv/functest/.boto:/root/.boto \
             -e DEBUG=$DEBUG \
@@ -254,6 +261,8 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-DEBUG:
           DEBUG: 'true'
       - cntt-EXTERNAL_NETWORK:
@@ -348,6 +357,8 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-branch:
           branch: 'master'
       - cntt-DEBUG:
@@ -523,6 +534,8 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-DEBUG:
           DEBUG: 'true'
       - cntt-EXTERNAL_NETWORK: