Add conditions to all multijobs steps

[releng.git] / jjb / airship / airship.yaml

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 5b39975..d577b20 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -56,8 +56,7 @@
     name: airship-run-containers
     builders:
       - shell: |
-          set +e
-          set -x
+          set +ex
           [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -66,7 +65,6 @@
           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=intel-pod17 \
@@ -81,7 +79,7 @@
             $image run_tests -t {test} -r
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID
+            gs://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
           find $WORKSPACE -type f \
             -printf \
             "http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID/%P\n"
@@ -318,6 +316,7 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
+          condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *airship-jobs
@@ -345,6 +344,7 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
+          condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *airship-jobs
@@ -368,6 +368,7 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
+          condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-benchmarking-{tag}-rally_full-run'
               <<: *airship-jobs
@@ -379,6 +380,7 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          condition: ALWAYS
           execution-type: SEQUENTIALLY
           projects:
             - name: 'airship-opnfv-functest-vnf-{tag}-cloudify-run'
@@ -393,6 +395,7 @@
               <<: *airship-jobs
       - multijob:
           name: opnfv/functest-features:{tag}
+          condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-features-{tag}-doctor-notification-run'
               <<: *airship-jobs