Merge ~raharper/curtin:fix/jenkins-filter-once-more into curtin:master

[Ryan Harper]

jenkins-runner: fix when using --filter only

The elif clause when checking for tests via positional or filter
parameters never took the path where we invoked vmtest-filter.
Fix this by only pre-populating tests with 'tests/vmtests' if
there are no positional parameters and no filter parameters.

Also re-indent filter block to match program style.

[Ryan Harper (raharper)]

Running a test-job with proposed enabled using three filters

target_distro=ubuntu
target_release=bionic
conf_file=*basic.yaml

Which selects test_basic.py:BionicTestBasic and runs it with -proposed pocket enabled.

If this is successful, then we can update the -proposed jenkins jobs to use the
target_distro=ubuntu filter to ensure we only run Ubuntu proposed upgrades (ignoring Centos)
And vmtest currently already knows to not test -proposed on the devel release.

https://jenkins.ubuntu.com/server/job/curtin-vmtest-devel-debug/109/console

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:26660752f1f181a90faeb575a23637b743b985cc
https://jenkins.ubuntu.com/server/job/curtin-ci/1083/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-arm64/1083
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-ppc64el/1083
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=metal-s390x/1083
    SUCCESS: https://jenkins.ubuntu.com/server/job/curtin-ci/nodes=torkoal/1083

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/curtin-ci/1083/rebuild

review: Approve (continuous-integration)

[Scott Moser (smoser)]

thanks.
For my feeble brain, I made the table below
http://paste.ubuntu.com/p/nXTNTksprF/

tests| ntfilters | result
 y | y | error
 n | n | use tests=( tests/vmtests )
 y | n | tests is set already, use "${tests[@]}"
 n | y | tests=$( $(vmtest-filter ...) )

review: Approve

diff --git a/tools/jenkins-runner b/tools/jenkins-runner
index c1cef8e..bf8ea0a 100755
--- a/tools/jenkins-runner
+++ b/tools/jenkins-runner
@@ -79,14 +79,14 @@ if [ "${#tests[@]}" -ne 0 -a "${#ntfilters[@]}" -ne 0 ]; then
     error "Passing test tests and --filter are incompatible."
     error "test arguments provided were: ${#tests[*]}"
     fail
-elif [ "${#tests[@]}" -eq 0 ]; then
+elif [ "${#tests[@]}" -eq 0 -a "${#ntfilters[@]}" -eq 0 ]; then
     tests=( tests/vmtests )
 elif [ "${#ntfilters[@]}" -ne 0 ]; then
-   tests=( $(./tools/vmtest-filter "${ntfilters[@]}") )
-   if [ "${#tests[@]}" -eq 0 ]; then
-      error "Failed to find any tests with filter(s): \"${ntfilters[*]}\""
-      fail "Try testing filters with: ./tools/vmtest-filter ${ntfilters[*]}"
-   fi
+    tests=( $(./tools/vmtest-filter "${ntfilters[@]}") )
+    if [ "${#tests[@]}" -eq 0 ]; then
+        error "Failed to find any tests with filter(s): \"${ntfilters[*]}\""
+        fail "Try testing filters with: ./tools/vmtest-filter ${ntfilters[*]}"
+    fi
 fi
 
 CURTIN_VMTEST_PARALLEL=$parallel