Merge lp:~canonical-platform-qa/qa-jenkins-jobs/iso-footprint-jobs-fix into lp:qa-jenkins-jobs

[Sergio Cazzolato]

Minor fix for iso tests cleanup.

[Sergio Cazzolato (sergio-j-cazzolato)]

Fix tested on https://platform-qa-jenkins.ubuntu.com/view/All/job/ubuntu-zesty-desktop-i386-iso-disk-footprint/121/console and https://platform-qa-jenkins.ubuntu.com/view/All/job/ubuntu-zesty-desktop-amd64-iso-disk-footprint/148/console

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

PASSED: Continuous integration, rev:217
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/87/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/256
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/256/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/254
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/254/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1571/console

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

review: Approve (continuous-integration)

[lp:~canonical-platform-qa/qa-jenkins-jobs/iso-footprint-jobs-fix]

218. By Sergio Cazzolato on 2017-02-08

use clear-artifacts builder

[Max Brustkern (nuclearbob)]

Looks good!

review: Approve

=== modified file 'jobs/iso-testing/jobs.yaml'
--- jobs/iso-testing/jobs.yaml	2017-02-08 17:50:27 +0000
+++ jobs/iso-testing/jobs.yaml	2017-02-08 21:04:42 +0000
@@ -473,13 +473,13 @@
             jobs: '{flavor}-{release}-desktop-{arch}-iso-download'
             result: 'success'
     builders:
+        - clear-artifacts
         - branch-bzr-project:
             project-url: 'lp:qakit'
             project-name: 'qakit'
         - grafana-setup
         - shell: |
             #!/bin/bash
-            rm -rf *
             mkdir -p $OUTPUTDIR
             export OUTPUTDIR=$WORKSPACE/results
             mkdir -p $DATADIR

=== modified file 'jobs/performance/jobs.yaml'
--- jobs/performance/jobs.yaml	2017-02-08 17:50:27 +0000
+++ jobs/performance/jobs.yaml	2017-02-08 21:04:42 +0000
@@ -43,19 +43,13 @@
     jobs:
         - 'kpi-tests-{device}-{model}-{release}-{arch}-unity8-{unity8-mode}'
 
-# builder stanzas describe reusable build steps
 - builder:
-    name: setup-env
+    name: run-performance-tests
     builders:
         - shell: |
-            rm -rf *
+            #!/bin/bash
+            set -ex
             mkdir $WORKSPACE/results
-
-- builder:
-    name: run-performance-tests
-    builders:
-        - shell: |
-            set -ex
             BUILDID=$(date +%Y%m%d)
             cat > job.json <<EOF
             {{
@@ -133,7 +127,7 @@
             default: KPI_DEVICE_TYPE={device} KPI_DEVICE_MODEL={model} KPI_OS_RELEASE={release} KPI_OS_ARCH={arch} KPI_UNITY8_MODE={unity8-mode}
             description: "Environment parameters"
     builders:
-        - setup-env:
+        - clear-artifacts:
         - branch-bzr-project:
             project-url: '$QAKIT_BRANCH'
             project-name: 'qakit'