Merge lp:~canonical-platform-qa/qa-jenkins-jobs/conditional-ust-ci into lp:qa-jenkins-jobs

[Allan LeSage]

Conditionally run ust MP CI only if tests to run are specified.

Now that we've installed the conditional-build-step plugin, use it to only run ust CI when the MP specifies a test to run.

[platform-qa-bot (platform-qa-bot)]

PASSED: Continuous integration, rev:173
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/45/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3158
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/3158/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3158
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/3158/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/650/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/45/rebuild

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Deploys correctly for me!

review: Approve

=== modified file 'jobs/ubuntu-system-tests/ci-jobs.yaml'
--- jobs/ubuntu-system-tests/ci-jobs.yaml	2016-08-03 17:11:19 +0000
+++ jobs/ubuntu-system-tests/ci-jobs.yaml	2016-08-24 18:58:14 +0000
@@ -96,8 +96,15 @@
 - builder:
     name: trigger-ust-builder
     builders:
-        - trigger-builds:
-            - project:
-                - 'ust_rc-proposed_krillin_sanity_test'
-              block: true
-              property-file: $WORKSPACE/ust-parameters.txt
+        - conditional-step:
+            condition-kind: not
+            condition-operand:
+                condition-kind: strings-match
+                condition-string1: ${PROPFILE,file="ust-parameters.txt",property="TESTS_TO_RUN"}
+                condition-string2: ""
+            steps:
+                - trigger-builds:
+                    - project:
+                        - 'ust_rc-proposed_krillin_sanity_test'
+                      block: true
+                      property-file: $WORKSPACE/ust-parameters.txt

=== modified file 'jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh'
--- jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh	2016-08-23 19:12:14 +0000
+++ jobs/ubuntu-system-tests/ubuntu-system-tests-builder.sh	2016-08-24 18:58:14 +0000
@@ -47,9 +47,9 @@
 	TESTS_TO_RUN=$(query_practitest_for_tests_to_run_by_filter 63805)
 	;;
     "")
-	# FIXME: restore error when we're able to install Conditional Build Step plugin!
-	echo "No tests specified, PASS!" >&2
-	exit 0
+	# NOTE that conditional build step should've prevented
+	echo "Please specify tests to run!" >&2
+	exit 1
 	;;
 esac