From f58bf252de439880a6b13a83e0b4027b6a344bcb Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dirk@dmllr.de>
Date: Fri, 26 May 2017 00:25:26 +0200
Subject: [PATCH] Drop support for Ubuntu precise

Ubuntu 12.04 LTS reached its regular End of Life on April 28, 2017.

Depends-On: I5e145095a10db112bb27516bfe652d2cdc052a61
Change-Id: I64af4c5183d77a75dcd062895d19b0a1330c8da8
---
 .../elements/base/pre-install.d/03-baseline-tools      |  6 +-----
 .../elements/bootloader/finalise.d/50-bootloader       |  2 +-
 .../install.d/05-set-cloud-init-sources                | 10 +---------
 .../elements/debootstrap/package-installs.yaml         |  1 -
 diskimage_builder/elements/debootstrap/pkg-map         |  7 -------
 .../dib-python/environment.d/50-dib-python-version     |  4 +---
 .../elements/ubuntu-core/root.d/10-cache-ubuntu-image  |  4 +++-
 .../test-elements/precise-build-succeeds/README.rst    |  1 -
 .../environment.d/10-set-distro.bash                   |  1 -
 tests/run_functests.sh                                 |  1 -
 10 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/README.rst
 delete mode 100644 diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash

diff --git a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools
index 3b5bb9a60..712b33cf4 100755
--- a/diskimage_builder/elements/base/pre-install.d/03-baseline-tools
+++ b/diskimage_builder/elements/base/pre-install.d/03-baseline-tools
@@ -12,10 +12,6 @@ case $DISTRO_NAME in
         # Note: add-apt-repository would be nice for RPM platforms too - so when we
         # need something like it, create a wrapper in dpkg/bin and fedora/bin.
         apt-get -y update
-        if [ "${DIB_RELEASE}" = "precise" ]; then
-            install-packages python-software-properties
-        else
-            install-packages software-properties-common
-        fi
+        install-packages software-properties-common
         ;;
 esac
diff --git a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
index a23086603..6b956f80d 100755
--- a/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
+++ b/diskimage_builder/elements/bootloader/finalise.d/50-bootloader
@@ -175,7 +175,7 @@ function install_grub2 {
     # grub-mkconfig generates a config with the device in it,
     # This shouldn't be needed, but old code has bugs
     DIB_RELEASE=${DIB_RELEASE:-}
-    if [ "$DIB_RELEASE" = 'precise' ] || [ "$DIB_RELEASE" = 'wheezy' ]; then
+    if [ "$DIB_RELEASE" = 'wheezy' ]; then
         sed -i "s%search --no.*%%" $GRUB_CFG
         sed -i "s%set root=.*%set root=(hd0,1)%" $GRUB_CFG
     fi
diff --git a/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources b/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
index b0995365d..1ae5acd70 100755
--- a/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
+++ b/diskimage_builder/elements/cloud-init-datasources/install.d/05-set-cloud-init-sources
@@ -15,17 +15,9 @@ if [ -z "$DIB_CLOUD_INIT_DATASOURCES" ] ; then
 fi
 
 if [ -d /etc/cloud/cloud.cfg.d ]; then
-    # DatasourceNone doesn't exist in Ubuntu 12.04 (Precise)
-    # which uses cloud-init version 0.6.3
-    if [ "$(lsb_release -cs)" = 'precise' ] ; then
-        cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
-datasource_list: [  $DIB_CLOUD_INIT_DATASOURCES ]
-EOF
-    else
-        cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
+    cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
 datasource_list: [  $DIB_CLOUD_INIT_DATASOURCES, None ]
 EOF
-    fi
     # Newer cloud-init versions complain by default when they should
     # use the Ec2 datasource on a non-AWS cloud.  If the Ec2
     # datasource is desired, we need to tell cloud-init that we really
diff --git a/diskimage_builder/elements/debootstrap/package-installs.yaml b/diskimage_builder/elements/debootstrap/package-installs.yaml
index f56709c80..5847c7fd9 100644
--- a/diskimage_builder/elements/debootstrap/package-installs.yaml
+++ b/diskimage_builder/elements/debootstrap/package-installs.yaml
@@ -1,6 +1,5 @@
 adduser:
 ca-certificates:
-cloud-initramfs-growroot:
 locales:
 lsb-release:
   phase: pre-install.d
diff --git a/diskimage_builder/elements/debootstrap/pkg-map b/diskimage_builder/elements/debootstrap/pkg-map
index cc0abde32..2ff5c4211 100644
--- a/diskimage_builder/elements/debootstrap/pkg-map
+++ b/diskimage_builder/elements/debootstrap/pkg-map
@@ -1,11 +1,4 @@
 {
-  "release": {
-    "ubuntu": {
-      "precise": {
-        "cloud-initramfs-growroot": "cloud-initramfs-growroot"
-       }
-     }
-   },
   "default": {
     "cloud-initramfs-growroot": ""
   }
diff --git a/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version b/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
index 6ab64d635..b75c96911 100644
--- a/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
+++ b/diskimage_builder/elements/dib-python/environment.d/50-dib-python-version
@@ -1,9 +1,7 @@
 # Pick which distros we need to force python2
 if [ -z "${DIB_PYTHON_VERSION:-}" ]; then
     if [ "$DISTRO_NAME" == "ubuntu" ]; then
-        if [ "$DIB_RELEASE" == "precise" ]; then
-            DIB_PYTHON_VERSION=2
-        elif [ "$DIB_RELEASE" == "trusty" ]; then
+        if [ "$DIB_RELEASE" == "trusty" ]; then
             DIB_PYTHON_VERSION=2
         fi
     elif [ "$DISTRO_NAME" == "debian" ]; then
diff --git a/diskimage_builder/elements/ubuntu-core/root.d/10-cache-ubuntu-image b/diskimage_builder/elements/ubuntu-core/root.d/10-cache-ubuntu-image
index 984ca0c0e..cd00ca2a9 100755
--- a/diskimage_builder/elements/ubuntu-core/root.d/10-cache-ubuntu-image
+++ b/diskimage_builder/elements/ubuntu-core/root.d/10-cache-ubuntu-image
@@ -17,10 +17,12 @@ shopt -s extglob
 DIB_RELEASE=${DIB_RELEASE:-trusty}
 
 declare -A release_numbers
-release_numbers[precise]=12.04
 release_numbers[trusty]=14.04
 release_numbers[vivid]=15.04
 release_numbers[wily]=15.10
+release_numbers[xenial]=16.04
+release_numbers[yakkety]=16.10
+release_numbers[zesty]=17.04
 
 numeric_release=${release_numbers[$DIB_RELEASE]}
 DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cdimage.ubuntu.com/ubuntu-core/releases/$numeric_release/release}
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/README.rst b/diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/README.rst
deleted file mode 100644
index b7190827e..000000000
--- a/diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/README.rst
+++ /dev/null
@@ -1 +0,0 @@
-Verify we can build a ubuntu-minimal image.
diff --git a/diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash
deleted file mode 100644
index 3747859b1..000000000
--- a/diskimage_builder/elements/ubuntu-minimal/test-elements/precise-build-succeeds/environment.d/10-set-distro.bash
+++ /dev/null
@@ -1 +0,0 @@
-export DIB_RELEASE=precise
diff --git a/tests/run_functests.sh b/tests/run_functests.sh
index ed8242058..d2af48c4d 100755
--- a/tests/run_functests.sh
+++ b/tests/run_functests.sh
@@ -32,7 +32,6 @@ DEFAULT_SKIP_TESTS=(
     gentoo/build-succeeds
     opensuse/build-succeeds
     opensuse/opensuse423-build-succeeds
-    ubuntu-minimal/precise-build-succeeds
     # good to have the test case around - but because of changes
     # in testing does not work always.
     debian-minimal/testing-build-succeeds