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
This commit is contained in:
parent
016b1f1522
commit
f58bf252de
@ -12,10 +12,6 @@ case $DISTRO_NAME in
|
|||||||
# Note: add-apt-repository would be nice for RPM platforms too - so when we
|
# 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.
|
# need something like it, create a wrapper in dpkg/bin and fedora/bin.
|
||||||
apt-get -y update
|
apt-get -y update
|
||||||
if [ "${DIB_RELEASE}" = "precise" ]; then
|
install-packages software-properties-common
|
||||||
install-packages python-software-properties
|
|
||||||
else
|
|
||||||
install-packages software-properties-common
|
|
||||||
fi
|
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
@ -175,7 +175,7 @@ function install_grub2 {
|
|||||||
# grub-mkconfig generates a config with the device in it,
|
# grub-mkconfig generates a config with the device in it,
|
||||||
# This shouldn't be needed, but old code has bugs
|
# This shouldn't be needed, but old code has bugs
|
||||||
DIB_RELEASE=${DIB_RELEASE:-}
|
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%search --no.*%%" $GRUB_CFG
|
||||||
sed -i "s%set root=.*%set root=(hd0,1)%" $GRUB_CFG
|
sed -i "s%set root=.*%set root=(hd0,1)%" $GRUB_CFG
|
||||||
fi
|
fi
|
||||||
|
@ -15,17 +15,9 @@ if [ -z "$DIB_CLOUD_INIT_DATASOURCES" ] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -d /etc/cloud/cloud.cfg.d ]; then
|
if [ -d /etc/cloud/cloud.cfg.d ]; then
|
||||||
# DatasourceNone doesn't exist in Ubuntu 12.04 (Precise)
|
cat > /etc/cloud/cloud.cfg.d/91-dib-cloud-init-datasources.cfg <<EOF
|
||||||
# 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
|
|
||||||
datasource_list: [ $DIB_CLOUD_INIT_DATASOURCES, None ]
|
datasource_list: [ $DIB_CLOUD_INIT_DATASOURCES, None ]
|
||||||
EOF
|
EOF
|
||||||
fi
|
|
||||||
# Newer cloud-init versions complain by default when they should
|
# Newer cloud-init versions complain by default when they should
|
||||||
# use the Ec2 datasource on a non-AWS cloud. If the Ec2
|
# use the Ec2 datasource on a non-AWS cloud. If the Ec2
|
||||||
# datasource is desired, we need to tell cloud-init that we really
|
# datasource is desired, we need to tell cloud-init that we really
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
adduser:
|
adduser:
|
||||||
ca-certificates:
|
ca-certificates:
|
||||||
cloud-initramfs-growroot:
|
|
||||||
locales:
|
locales:
|
||||||
lsb-release:
|
lsb-release:
|
||||||
phase: pre-install.d
|
phase: pre-install.d
|
||||||
|
@ -1,11 +1,4 @@
|
|||||||
{
|
{
|
||||||
"release": {
|
|
||||||
"ubuntu": {
|
|
||||||
"precise": {
|
|
||||||
"cloud-initramfs-growroot": "cloud-initramfs-growroot"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"default": {
|
"default": {
|
||||||
"cloud-initramfs-growroot": ""
|
"cloud-initramfs-growroot": ""
|
||||||
}
|
}
|
||||||
|
@ -1,9 +1,7 @@
|
|||||||
# Pick which distros we need to force python2
|
# Pick which distros we need to force python2
|
||||||
if [ -z "${DIB_PYTHON_VERSION:-}" ]; then
|
if [ -z "${DIB_PYTHON_VERSION:-}" ]; then
|
||||||
if [ "$DISTRO_NAME" == "ubuntu" ]; then
|
if [ "$DISTRO_NAME" == "ubuntu" ]; then
|
||||||
if [ "$DIB_RELEASE" == "precise" ]; then
|
if [ "$DIB_RELEASE" == "trusty" ]; then
|
||||||
DIB_PYTHON_VERSION=2
|
|
||||||
elif [ "$DIB_RELEASE" == "trusty" ]; then
|
|
||||||
DIB_PYTHON_VERSION=2
|
DIB_PYTHON_VERSION=2
|
||||||
fi
|
fi
|
||||||
elif [ "$DISTRO_NAME" == "debian" ]; then
|
elif [ "$DISTRO_NAME" == "debian" ]; then
|
||||||
|
@ -17,10 +17,12 @@ shopt -s extglob
|
|||||||
DIB_RELEASE=${DIB_RELEASE:-trusty}
|
DIB_RELEASE=${DIB_RELEASE:-trusty}
|
||||||
|
|
||||||
declare -A release_numbers
|
declare -A release_numbers
|
||||||
release_numbers[precise]=12.04
|
|
||||||
release_numbers[trusty]=14.04
|
release_numbers[trusty]=14.04
|
||||||
release_numbers[vivid]=15.04
|
release_numbers[vivid]=15.04
|
||||||
release_numbers[wily]=15.10
|
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]}
|
numeric_release=${release_numbers[$DIB_RELEASE]}
|
||||||
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cdimage.ubuntu.com/ubuntu-core/releases/$numeric_release/release}
|
DIB_CLOUD_IMAGES=${DIB_CLOUD_IMAGES:-http://cdimage.ubuntu.com/ubuntu-core/releases/$numeric_release/release}
|
||||||
|
@ -1 +0,0 @@
|
|||||||
Verify we can build a ubuntu-minimal image.
|
|
@ -1 +0,0 @@
|
|||||||
export DIB_RELEASE=precise
|
|
@ -32,7 +32,6 @@ DEFAULT_SKIP_TESTS=(
|
|||||||
gentoo/build-succeeds
|
gentoo/build-succeeds
|
||||||
opensuse/build-succeeds
|
opensuse/build-succeeds
|
||||||
opensuse/opensuse423-build-succeeds
|
opensuse/opensuse423-build-succeeds
|
||||||
ubuntu-minimal/precise-build-succeeds
|
|
||||||
# good to have the test case around - but because of changes
|
# good to have the test case around - but because of changes
|
||||||
# in testing does not work always.
|
# in testing does not work always.
|
||||||
debian-minimal/testing-build-succeeds
|
debian-minimal/testing-build-succeeds
|
||||||
|
Loading…
Reference in New Issue
Block a user