From f22e4e5625450321a628885f30216d653b5cf0b1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Thu, 19 Sep 2019 22:01:37 +0200
Subject: [PATCH] Publish the right Airship test POD
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

It adds debug to highlight the slave misconfiguration.

Change-Id: I3a392df8b562959f5b0757783a4331e54e340d79
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 jjb/airship/airship.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index e2428d604..5b3997532 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -56,7 +56,8 @@
     name: airship-run-containers
     builders:
       - shell: |
-          set +ex
+          set +e
+          set -x
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -65,9 +66,11 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          echo $WORKSPACE
           docker run --rm \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=airship \
+            -e NODE_NAME=intel-pod17 \
+            -e INSTALLER_TYPE=airship \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEBUG=True \
             -e EXTERNAL_NETWORK=public \
@@ -78,7 +81,7 @@
             $image run_tests -t {test} -r
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
+            gs://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID
           find $WORKSPACE -type f \
             -printf \
             "http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID/%P\n"
-- 
2.16.6