Merge lp:~canonical-platform-qa/qa-jenkins-jobs/vis-updates into lp:qa-jenkins-jobs

[Allan LeSage]

Vis updates post-deployment.

Some updates both for vis MP changes and a few oversights from the initial deployment.

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

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

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

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

Looks good!

review: Approve

=== modified file 'jobs/vis/jobs.yaml'
--- jobs/vis/jobs.yaml	2016-07-11 17:50:44 +0000
+++ jobs/vis/jobs.yaml	2016-07-14 21:43:24 +0000
@@ -29,6 +29,11 @@
             name: QAKIT_BRANCH
             default: lp:qakit
             description: Launchpad branch from which to run qakit scripts.
+        - string:
+            name: MONGO_HOST
+            default: 10.25.236.13
+            description: IP of mongo instance in which to store Jenkins job data.
+    node: jenkins-slave-2
     builders:
         - shell:
             !include-raw: 'vis.sh'

=== modified file 'jobs/vis/vis.sh'
--- jobs/vis/vis.sh	2016-07-11 17:50:44 +0000
+++ jobs/vis/vis.sh	2016-07-14 21:43:24 +0000
@@ -15,18 +15,18 @@
 
 mkdir -p ${WORKSPACE}/results
 rm -rf ${WORKSPACE}/results/*
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_krillin_sanity.html ust_rc-proposed_krillin_sanity
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_krillin_regression.html ust_rc-proposed_krillin_regression
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_arale_sanity.html ust_rc-proposed_arale_sanity
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_arale_regression.html ust_rc-proposed_arale_regression
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_krillin_sanity.html ust_rc_krillin_sanity
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_krillin_regression.html ust_rc_krillin_regression
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_arale_sanity.html ust_rc_arale_sanity
-python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_arale_regression.html ust_rc_arale_regression
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_krillin_sanity.json ust_rc-proposed_krillin_sanity
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_krillin_regression.json ust_rc-proposed_krillin_regression
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_arale_sanity.json ust_rc-proposed_arale_sanity
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc-proposed_arale_regression.json ust_rc-proposed_arale_regression
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_krillin_sanity.json ust_rc_krillin_sanity
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_krillin_regression.json ust_rc_krillin_regression
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_arale_sanity.json ust_rc_arale_sanity
+python3 qakit/vis/visualize.py --mongo-host $MONGO_HOST -o ${WORKSPACE}/results/ust_rc_arale_regression.json ust_rc_arale_regression
 
 deactivate
 
 rsync -avz --delete --password-file $JENKINS_HOME/.secret/cranberry-rsync-password --ignore-times $WORKSPACE/results/* [e-mail]::jenkaas-qa-reports/vis
 
 # also do a deployment
-rsync -avz --delete --password-file $JENKINS_HOME/.secret/cranberry-rsync-password --ignore-times $WORKSPACE/qakit/vis/*.html [e-mail]::jenkaas-qa-reports/vis
+rsync -avz --delete --password-file $JENKINS_HOME/.secret/cranberry-rsync-password --ignore-times $WORKSPACE/qakit/qakit/vis/dashboard/* [e-mail]::jenkaas-qa-reports/vis