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

[Sergio Cazzolato]

Update iso footprint jobs to support new grafana scripts

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

PASSED: Continuous integration, rev:213
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/83/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/249
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/249/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/247
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/247/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1563/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:214
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/84/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/251
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/251/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/249
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/249/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1568/console

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

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:215
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/85/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/252
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/252/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/250
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/250/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1569/console

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Looks good!

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

FAILED: Autolanding.
Unapproved changes made after approval.
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-autoland/2462/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/253
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/253/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/251
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/251/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-land-mp/2657/console

review: Needs Fixing (continuous-integration)

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

216. By Sergio Cazzolato on 2017-02-08

Merge with trunk

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

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

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

review: Approve (continuous-integration)

=== modified file 'jobs/iso-testing/jobs.yaml'
--- jobs/iso-testing/jobs.yaml	2017-01-04 15:59:52 +0000
+++ jobs/iso-testing/jobs.yaml	2017-02-08 18:13:54 +0000
@@ -473,26 +473,17 @@
             jobs: '{flavor}-{release}-desktop-{arch}-iso-download'
             result: 'success'
     builders:
+        - branch-bzr-project:
+            project-url: 'lp:qakit'
+            project-name: 'qakit'
+        - grafana-setup
         - shell: |
-            echo "Creating results dir"
+            #!/bin/bash
+            rm -rf *
+            mkdir -p $OUTPUTDIR
             export OUTPUTDIR=$WORKSPACE/results
-            rm -rf $OUTPUTDIR
-            mkdir -p $OUTPUTDIR
+            mkdir -p $DATADIR
             export DATADIR=/data/footprint/{flavor}-{release}-desktop-{arch}
-            mkdir -p $DATADIR
-
-            echo "Downloading QAKIT"
-            rm -rf qakit
-            bzr branch lp:qakit qakit
-            export PYTHONPATH=qakit
-
-            echo "Setting up grafana"
-            export CARBON_SERVER=10.25.236.71
-            export CARBON_PORT=2003
-
-            echo "Setting up mongo"
-            export MONGO_HOST=10.25.236.10
-            export MONGO_PORT=27017
 
             echo "Getting build id"
             ISO="/data/iso/{flavor}/{release}-desktop-{arch}.iso"
@@ -509,6 +500,10 @@
             echo "Running iso footprint"
             ./qakit/disk_footprint/iso_footprint.sh -d /data/iso/{flavor}/{release}-desktop-{arch}.iso -D $OUTPUTDIR $PREVARGS
 
+            echo "Running sync with grafana"
+            source $WORKSPACE/grafana.conf
+            $GRAFANA_INTEGRATION_PATH/run_script sync-iso $ISO $OUTPUTDIR/$BUILD_ID -m iso_01 -t $(date +%s)
+
             echo "Moving old data"
             cp -rf $OUTPUTDIR/* $DATADIR/
             rm -rf $OUTPUTDIR/*

=== modified file 'jobs/macros.yaml'
--- jobs/macros.yaml	2017-02-07 21:47:51 +0000
+++ jobs/macros.yaml	2017-02-08 18:13:54 +0000
@@ -20,10 +20,18 @@
             cat media_info
 
 - builder:
+    name: branch-bzr-project
+    builders:
+        - shell: |
+            bzr branch {project-url} {project-name}
+
+- builder:
     name: grafana-setup
     builders:
+        - branch-bzr-project:
+            project-url: 'lp:custom-grafana-integration'
+            project-name: 'grafana-integration'
         - shell: |
-            bzr branch lp:custom-grafana-integration $WORKSPACE/grafana-integration
             cat > $WORKSPACE/grafana.conf <<EOF
             export MONGO_HOST=10.25.236.10
             export MONGO_PORT=27017
@@ -39,6 +47,7 @@
     builders:
         - grafana-setup:
         - shell: |
+            #!/bin/bash
             source $WORKSPACE/grafana.conf
             if [ -z "$BUILDSTAMP" ] ; then
                 BUILDSTAMP=$(grep -o '([0-9.]\+)' media_info | tr -d '()')

=== modified file 'jobs/performance/jobs.yaml'
--- jobs/performance/jobs.yaml	2017-02-08 00:12:49 +0000
+++ jobs/performance/jobs.yaml	2017-02-08 18:13:54 +0000
@@ -52,12 +52,6 @@
             mkdir $WORKSPACE/results
 
 - builder:
-    name: branch-bzr-project
-    builders:
-        - shell: |
-            bzr branch {project-url} {project-name}
-
-- builder:
     name: run-performance-tests
     builders:
         - shell: |
@@ -88,6 +82,7 @@
     builders:
         - grafana-setup
         - shell: |
+            #!/bin/bash
             set -ex
             source $WORKSPACE/grafana.conf
             $GRAFANA_INTEGRATION_PATH/run_script sync-perf -l $WORKSPACE/results/tests.log -m performance_01 -t $(date +%s)