Revert all gsutil debugs

It reverts the next two changes (the jenkins misconfigrations are
bypassed):
https://gerrit.opnfv.org/gerrit/c/releng/+/68792
https://gerrit.opnfv.org/gerrit/c/releng/+/68793

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

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 91a1e0b..0834bd8 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -50,8 +50,7 @@
     name: cntt-run-containers
     builders:
       - shell: |
-          set +e
-          set -x
+          set +ex
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{functest_tag}
@@ -74,8 +73,8 @@
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
             $image run_tests -t {test} -r
           res=$?
-          gsutil -DD -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID
+          gsutil -m cp -r $WORKSPACE/ \
+            gs://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
           find $WORKSPACE -type f \
             -printf \
             "http://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID/%P\n"