Merge ~paride/qa-jenkins-jobs:jjb2 into qa-jenkins-jobs:master

[Paride Legovini]

Make the jobs and deploy script compatible with JJB in Bionic

Changes:
 - deploy-jobs.sh: call jenkins-jobs directly
 - make the jobs definitions compatible with JJB 2.x

[Jean-Baptiste Lallement (jibel)]

LGTM. THanks for the debugging session and fixing this.

review: Approve

diff --git a/jobs/auto-upgrade-testing/jobs.yaml b/jobs/auto-upgrade-testing/jobs.yaml
index d457701..d75375e 100755
--- a/jobs/auto-upgrade-testing/jobs.yaml
+++ b/jobs/auto-upgrade-testing/jobs.yaml
@@ -78,11 +78,12 @@
     publishers:
         - postbuildscript:
             builders:
-                - shell: 'sudo chown -R $USER:$USER "$WORKSPACE/{profile}"'
-                - grafana-tests-upload:
-                    results_type: 'xunit'
-                    results_file: 'junit.xml'
-                    info_file: 'global_info.json'
+                - build-steps:
+                    - shell: 'sudo chown -R $USER:$USER "$WORKSPACE/{profile}"'
+                    - grafana-tests-upload:
+                        results_type: 'xunit'
+                        results_file: 'junit.xml'
+                        info_file: 'global_info.json'
             script-only-if-succeeded: False
             script-only-if-failed: False
         - archive:
@@ -97,4 +98,4 @@
         It can be run again to update to the latest versions of dependencies
         Defined in lp:qa-jenkins-jobs
     builders:
-        shell: pip3 install --user junitparser
+        - shell: pip3 install --user junitparser
diff --git a/jobs/ubiquity/jobs.yaml b/jobs/ubiquity/jobs.yaml
index ce24ce9..48417c0 100755
--- a/jobs/ubiquity/jobs.yaml
+++ b/jobs/ubiquity/jobs.yaml
@@ -117,21 +117,22 @@
         - archive-artifacts
         - postbuildscript:
             builders:
-                - generate-junit-files:
-                    source_dir: 'results/var/local/autopilot/junit'
-                    test: '{test}'
-                - grafana-info:
-                    device: 'vm'
-                    model: ''
-                    os: '{flavor}'
-                    release: '{release}'
-                    arch: '{arch}'
-                    class: 'ubiquity'
-                    conf: ''
-                - grafana-tests-upload:
-                    results_type: 'xunit'
-                    results_file: 'junit.xml'
-                    info_file: 'global_info.json'
+                - build-steps:
+                    - generate-junit-files:
+                        source_dir: 'results/var/local/autopilot/junit'
+                        test: '{test}'
+                    - grafana-info:
+                        device: 'vm'
+                        model: ''
+                        os: '{flavor}'
+                        release: '{release}'
+                        arch: '{arch}'
+                        class: 'ubiquity'
+                        conf: ''
+                    - grafana-tests-upload:
+                        results_type: 'xunit'
+                        results_file: 'junit.xml'
+                        info_file: 'global_info.json'
             script-only-if-succeeded: False
             script-only-if-failed: False
         - junit:
diff --git a/jobs/ubuntu-system-tests/jobs.yaml b/jobs/ubuntu-system-tests/jobs.yaml
index cea8ce1..726fff4 100755
--- a/jobs/ubuntu-system-tests/jobs.yaml
+++ b/jobs/ubuntu-system-tests/jobs.yaml
@@ -116,19 +116,20 @@
             allow-empty: 'true'
         - postbuildscript:
             builders:
-                - subunit-to-junit-results-builder
-                - grafana-info:
-                    device: 'vm'
-                    model: '{model}'
-                    os: '{flavor}'
-                    release: '{release}'
-                    arch: '{arch}'
-                    class: 'system-tests'
-                    conf: ''
-                - grafana-tests-upload:
-                    results_type: 'pyunit'
-                    results_file: 'results/*.pyunit'
-                    info_file: 'global_info.json'
+                - build-steps:
+                    - subunit-to-junit-results-builder
+                    - grafana-info:
+                        device: 'vm'
+                        model: '{model}'
+                        os: '{flavor}'
+                        release: '{release}'
+                        arch: '{arch}'
+                        class: 'system-tests'
+                        conf: ''
+                    - grafana-tests-upload:
+                        results_type: 'pyunit'
+                        results_file: 'results/*.pyunit'
+                        info_file: 'global_info.json'
             script-only-if-succeeded: False
             script-only-if-failed: False
         - junit:
diff --git a/scripts/deploy-jobs.sh b/scripts/deploy-jobs.sh
index 3cd540e..6271741 100755
--- a/scripts/deploy-jobs.sh
+++ b/scripts/deploy-jobs.sh
@@ -11,4 +11,4 @@ case $1 in
 esac
 
 make -C "$JOB_PATH"
-python3 -m jenkins_jobs.cmd $ARGS -r "$JOB_PATH"
+jenkins-jobs $ARGS -r "$JOB_PATH"