Merge lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-maas-stilson2 into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Francis Ginther]

Update the maas build scripts to use the ppc64el config on stilson which reports `ppc64le` for `uname -m` and use a raw disk attached to /dev/vdc.

The change from snyder to stilson resulted in a change in `uname -m`. It now reports as `ppc64le`. The build config uses this to pivot to a different cfg file which contains a different package set to install.

Also, kvm now mounts the raw disk used to pass the contents of the build in /dev/vdc instead of /dev/vdb.

[Robert C Jennings (rcj)]

+1

review: Approve

[Philip Roche (philroche)]

review: Approve

[lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm-maas-stilson2]

801. By Francis Ginther on 2018-07-02

The maas raw disk is now on /dev/vdc

[Philip Roche (philroche)]

review: Approve

[Robert C Jennings (rcj)]

One possible improvement below but I'm +1 if that idea is unworkable or too far out of scope.

review: Approve

[Francis Ginther (fginther)]

@rcj, as we discussed over a hangout, the snyder disks were placed in a different host. So stilson is not impacted when those disks are removed.

I do think we can revisit this logic should the devices be renamed again as it's a frustrating change to debug.

=== modified file 'jenkins/MAASv2_Builder.sh'
--- jenkins/MAASv2_Builder.sh	2016-09-28 19:52:00 +0000
+++ jenkins/MAASv2_Builder.sh	2018-07-02 21:17:14 +0000
@@ -95,7 +95,7 @@
 set +x
 
 ci_cfg="${kvm_builder}/config/cloud-maasv2.cfg"
-[ "$(uname -m)" == "ppc64" ] && ci_cfg="${kvm_builder}/config/cloud-trusty-pp64el.cfg"
+[ "$(uname -m)" == "ppc64le" ] && ci_cfg="${kvm_builder}/config/cloud-trusty-pp64el.cfg"
 
 # Launch KVM to do the work
 launch_kvm.sh \

=== modified file 'jenkins/MAASv3_Builder.sh'
--- jenkins/MAASv3_Builder.sh	2016-10-04 18:53:03 +0000
+++ jenkins/MAASv3_Builder.sh	2018-07-02 21:17:14 +0000
@@ -47,7 +47,7 @@
     fail "Failed to configure KVM instance for building"
 
 ci_cfg="${kvm_builder}/config/cloud-maasv3.cfg"
-[ "$(uname -m)" == "ppc64" ] && ci_cfg="${kvm_builder}/config/cloud-trusty-pp64el.cfg"
+[ "$(uname -m)" == "ppc64le" ] && ci_cfg="${kvm_builder}/config/cloud-trusty-pp64el.cfg"
 
 # Launch KVM to do the work
 launch_kvm.sh \

=== modified file 'templates/img-maasv2.tmpl'
--- templates/img-maasv2.tmpl	2015-09-16 23:14:53 +0000
+++ templates/img-maasv2.tmpl	2018-07-02 21:17:14 +0000
@@ -7,7 +7,7 @@
 fail() {
     [ $# -eq 0 ] || error "$@";
     echo "Failed" > /tmp/failed;
-    tar -C /tmp -cvf /dev/vdb failed build.log;
+    tar -C /tmp -cvf /dev/vdc failed build.log;
     shutdown -P now;
     exit 1;
 }
@@ -128,9 +128,9 @@
 done
 
 # Finish the work
-echo "Taring up artifacts to /dev/vdb!"
+echo "Taring up artifacts to /dev/vdc!"
 touch /tmp/success
-tar -C /tmp -cvf /dev/vdb maas_images /var/log/* logs success build.log "${OUT_D}" >> /dev/null
+tar -C /tmp -cvf /dev/vdc maas_images /var/log/* logs success build.log "${OUT_D}" >> /dev/null
 sync
 shutdown -P now
 

=== modified file 'templates/img-maasv3.tmpl'
--- templates/img-maasv3.tmpl	2016-10-06 15:20:55 +0000
+++ templates/img-maasv3.tmpl	2018-07-02 21:17:14 +0000
@@ -7,7 +7,7 @@
 fail() {
     [ $# -eq 0 ] || error "$@";
     echo "Failed" > /tmp/failed;
-    tar -C /tmp -cvf /dev/vdb failed build.log;
+    tar -C /tmp -cvf /dev/vdc failed build.log;
     shutdown -P now;
     exit 1;
 }
@@ -76,9 +76,9 @@
 done
 
 # Finish the work
-echo "Taring up artifacts to /dev/vdb!"
+echo "Taring up artifacts to /dev/vdc!"
 touch /tmp/success
-tar -C /tmp -cvf /dev/vdb maas_images /var/log/* logs success build.log "${OUT_D}" >> /dev/null
+tar -C /tmp -cvf /dev/vdc maas_images /var/log/* logs success build.log "${OUT_D}" >> /dev/null
 sync
 shutdown -P now