Merge lp:~fginther/vmbuilder/new-artful-builder into lp:~ubuntu-on-ec2/vmbuilder/jenkins_kvm

[Francis Ginther]

Update source image and package set for artful. Dropping packages that no longer exist.

Update source image and package set for artful. Dropping packages that no longer exist.

This was used to build a new artful builder on jerff [1] which was then used to build a 17.10 Oracle Compute image [2]

[1] - https://cloud-images-jenkins.canonical.com/job/Update_Builder_Image/91/
[2] - https://cloud-images-jenkins.canonical.com/job/CloudImages_SmallCPC_Base/4753/

[Dan Watkins (oddbloke)]

Couple of inline comments, but broadly speaking I like this a lot.

review: Needs Fixing

[lp:~fginther/vmbuilder/new-artful-builder]

794. By Francis Ginther on 2017-10-20

Restore proper builder setup for zesty and build anything newer with artful.

[Dan Watkins (oddbloke)]

One last comment inline.

review: Needs Fixing

[Chris Glass (tribaal)]

Looks good! nitpicks inline.

+1

review: Approve

[lp:~fginther/vmbuilder/new-artful-builder]

795. By Francis Ginther on 2017-10-26

Use zesty to build zesty and unify indentation over the code being modified.

[Philip Roche (philroche)]

+1

review: Approve

[Dan Watkins (oddbloke)]

review: Approve

=== modified file 'jenkins/CloudImages_Update_Builder.sh'
--- jenkins/CloudImages_Update_Builder.sh	2016-08-03 10:33:46 +0000
+++ jenkins/CloudImages_Update_Builder.sh	2017-10-26 19:37:10 +0000
@@ -18,13 +18,18 @@
 
 # Copy the target disk image
 case ${SUITE} in
-    precise|trusty|wily|xenial)
+    trusty|xenial)
         disk_orig="${SUITE}-server-cloudimg-${ARCH}-disk1.img"
         builder_img=/srv/builder/images/trusty-builder-latest.img
         ;;
+    zesty)
+        # Zesty needs yakkety or newer due to ext4 tool changes
+        disk_orig="${SUITE}-server-cloudimg-${ARCH}.img"
+        builder_img=/srv/builder/images/zesty-builder-latest.img
+        ;;
     *)
         disk_orig="${SUITE}-server-cloudimg-${ARCH}.img"
-        builder_img=/srv/builder/images/yakkety-builder-latest.img
+        builder_img=/srv/builder/images/artful-builder-latest.img
         ;;
 esac
 

=== modified file 'templates/img-update.tmpl'
--- templates/img-update.tmpl	2017-10-10 22:34:03 +0000
+++ templates/img-update.tmpl	2017-10-26 19:37:10 +0000
@@ -44,14 +44,6 @@
 
 [ "${dev_uuid}" == "${odev_uuid}" ] && fail "device ID's are the same. This is bad"
 
-# dist_ge(dist1,dist2)
-# return true if dist1 is newer or the same as dist2
-dist_ge() { [[ "$1" > "$2" || "$1" == "$2" ]]; }
-
-# dist_ge(dist1,dist2)
-# return true if dist2 is older than or the same as dist2
-dist_le() { [[ "$1" < "$2" || "$1" == "$2" ]]; }
-
 operation_files() {
 
 	for i in $(seq 0 $((${#file_list[@]} - 1)))
@@ -210,28 +202,29 @@
       dkms
       git)
 
-if [ "${suite}" == "precise" ]; then
-	pkgs+=(linux-source-3.2.0 qemu-kvm-extras qemu-kvm-extras-static)
-else
-	case "${suite}" in
-		trusty|xenial) # not for yakkety onward
-			xchroot apt-add-repository -y ppa:snappy-dev/tools
-			xchroot apt-add-repository -y ppa:ubuntu-sdk-team/ppa
-			;;
-	esac
-	xchroot apt-add-repository -y multiverse
-	pkgs+=(qemu-user-static
-		   qemu-user
-		   ubuntu-device-flash
-		   ubuntu-snappy-cli
-		   python-openstackclient
-		   cloud-utils)
-	case "${suite}" in
-		trusty|xenial)
-			pkgs+=(ubuntu-core-security-utils)
-			;;
-	esac
-fi
+case "${suite}" in
+	trusty|xenial) # not for yakkety onward
+		xchroot apt-add-repository -y ppa:snappy-dev/tools
+		xchroot apt-add-repository -y ppa:ubuntu-sdk-team/ppa
+		;;
+esac
+xchroot apt-add-repository -y multiverse
+pkgs+=(qemu-user-static
+	qemu-user
+	ubuntu-snappy-cli
+	python-openstackclient
+	cloud-utils)
+case "${suite}" in
+	trusty|xenial)
+		pkgs+=(ubuntu-core-security-utils)
+		;;
+esac
+# ubuntu-device-flash was dropped after zesty
+case "${suite}" in
+	trusty|xenial|zesty)
+		pkgs+=(ubuntu-device-flash)
+		;;
+esac
 
 # Installation of packages
 debug "Performing package operations"
@@ -241,19 +234,21 @@
 debug "Package operations complete"
 
 # Install ZFS
-if dist_ge ${suite} xenial; then
-	xchroot apt-get -y install zfsutils-linux
-
-else
-	debug "Installing ZFS"
-	xchroot apt-add-repository -y ppa:zfs-native/stable
-	xchroot apt-get update
-	xchroot apt-get -y install spl
-	xchroot dpkg-reconfigure spl
-	xchroot apt-get -y install ubuntu-zfs
-	xchroot dpkg-reconfigure dkms
-	debug "Installed ZFS"
-fi
+case "${suite}" in
+	trusty)
+		debug "Installing ZFS"
+		xchroot apt-add-repository -y ppa:zfs-native/stable
+		xchroot apt-get update
+		xchroot apt-get -y install spl
+		xchroot dpkg-reconfigure spl
+		xchroot apt-get -y install ubuntu-zfs
+		xchroot dpkg-reconfigure dkms
+		debug "Installed ZFS"
+		;;
+	*)
+		xchroot apt-get -y install zfsutils-linux
+		;;
+esac
 
 # Modify boot settings
 debug "Modifying in-image settings for builder"
@@ -264,7 +259,7 @@
 xchroot update-initramfs -u -k all
 # On yakkety and later, reinstall grub-pc which is no longer in the base image
 case $suite in
-    precise|trusty|xenial)
+    trusty|xenial)
         xchroot dpkg-reconfigure grub-pc
         ;;
     *)