From d3bf8b7f95918e75784d06b50c2e4c678c01a06b Mon Sep 17 00:00:00 2001 From: Gage Hugo Date: Wed, 27 Apr 2022 12:49:07 -0500 Subject: [PATCH] Remove usage of ubuntu xenial This change removes or updates any usage of ubuntu xenial either to a newer version or removes any building of xenial images in favor of using newer ones. Change-Id: Ice391a36e17cdbe6783f42aa1d34d7dfe5fb6282 --- Makefile | 6 ------ README_MAKEFILE | 2 +- libvirt/build.sh | 2 +- nova-ssh/build.sh | 2 +- openstack/loci/build.sh | 2 +- tempest/Dockerfile.ubuntu_xenial | 26 -------------------------- tempest/build.sh | 2 +- 7 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 tempest/Dockerfile.ubuntu_xenial diff --git a/Makefile b/Makefile index d3d4482d..dc8e2999 100644 --- a/Makefile +++ b/Makefile @@ -43,12 +43,6 @@ images: build_$(IMAGE_NAME) # Make targets intended for use by the primary targets above. .PHONY: build_$(IMAGE_NAME) build_$(IMAGE_NAME): -ifeq ($(OS_RELEASE), ubuntu_xenial) - docker build -f $(IMAGE_NAME)/Dockerfile.$(OS_RELEASE) \ - --network host \ - $(EXTRA_BUILD_ARGS) \ - -t $(IMAGE) \ - . else ifeq ($(OS_RELEASE), ubuntu_bionic) docker build -f $(IMAGE_NAME)/Dockerfile.$(OS_RELEASE) \ --network host \ diff --git a/README_MAKEFILE b/README_MAKEFILE index 32ca320d..06d9620d 100644 --- a/README_MAKEFILE +++ b/README_MAKEFILE @@ -8,7 +8,7 @@ Usage: make IMAGE_NAME=<> OS_RELEASE=<> eg: - make IMAGE_NAME=ceph-daemon OS_RELEASE=ubuntu_xenial + make IMAGE_NAME=ceph-daemon OS_RELEASE=ubuntu_focal make IMAGE_NAME=openvswitch OS_RELEASE=debian diff --git a/libvirt/build.sh b/libvirt/build.sh index 41090a3f..7e0354a7 100755 --- a/libvirt/build.sh +++ b/libvirt/build.sh @@ -7,7 +7,7 @@ cd ${SCRIPT_DIR}/.. IMAGE="libvirt" LIBVIRT_VERSION=${LIBVIRT_VERSION:-"1.3.1-1ubuntu10.24"} VERSION=${VERSION:-latest} -DISTRO=${DISTRO:-ubuntu_xenial} +DISTRO=${DISTRO:-ubuntu_focal} REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-"-${LIBVIRT_VERSION}"} docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} --build-arg LIBVIRT_VERSION="${LIBVIRT_VERSION}" ${extra_build_args} ${IMAGE} diff --git a/nova-ssh/build.sh b/nova-ssh/build.sh index b7029664..17afe850 100644 --- a/nova-ssh/build.sh +++ b/nova-ssh/build.sh @@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/.. IMAGE="nova-ssh" VERSION=${VERSION:-latest} -DISTRO=${DISTRO:-ubuntu_xenial} +DISTRO=${DISTRO:-ubuntu_focal} REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE} diff --git a/openstack/loci/build.sh b/openstack/loci/build.sh index 95a9e2d2..a049b773 100755 --- a/openstack/loci/build.sh +++ b/openstack/loci/build.sh @@ -170,7 +170,7 @@ VERSION=${VERSION:-"latest"} # The openstack branch to build, if no per project branch is given. OPENSTACK_VERSION=${OPENSTACK_VERSION:-"master"} # Sepcify OS distribution -DISTRO=${DISTRO:-"ubuntu_xenial"} +DISTRO=${DISTRO:-"ubuntu_focal"} # extra build arguments for the base image. See loci's dockerfiles for # arguments that could be used for example. base_extra_build_args=${base_extra_build_args:-"--force-rm --pull --no-cache"} diff --git a/tempest/Dockerfile.ubuntu_xenial b/tempest/Dockerfile.ubuntu_xenial deleted file mode 100644 index db9a3e0b..00000000 --- a/tempest/Dockerfile.ubuntu_xenial +++ /dev/null @@ -1,26 +0,0 @@ -ARG FROM=ubuntu:16.04 -FROM ${FROM} - -RUN set -ex ;\ - export DEBIAN_FRONTEND=noninteractive ;\ - apt-get update ;\ - apt-get upgrade -y ;\ - apt-get install netbase -y ;\ - apt-get install --no-install-recommends -y \ - python3-dev \ - build-essential \ - python3-pip \ - libssl-dev \ - git ;\ - git clone https://git.openstack.org/openstack/tempest ;\ - git clone https://git.openstack.org/openstack/cinder-tempest-plugin ;\ - git clone https://git.openstack.org/openstack/heat-tempest-plugin ;\ - git clone https://git.openstack.org/openstack/keystone-tempest-plugin ;\ - git clone https://git.openstack.org/openstack/neutron-tempest-plugin ;\ - pip3 install -U setuptools ;\ - pip3 install wheel ;\ - pip3 install -e tempest/ \ - cinder-tempest-plugin/ \ - heat-tempest-plugin/ \ - keystone-tempest-plugin/ \ - neutron-tempest-plugin/ ;\ diff --git a/tempest/build.sh b/tempest/build.sh index b230e540..f1f7cda0 100755 --- a/tempest/build.sh +++ b/tempest/build.sh @@ -6,7 +6,7 @@ cd ${SCRIPT_DIR}/.. IMAGE="tempest" VERSION=${VERSION:-latest} -DISTRO=${DISTRO:-ubuntu_xenial} +DISTRO=${DISTRO:-ubuntu_focal} REGISTRY_URI=${REGISTRY_URI:-"openstackhelm/"} EXTRA_TAG_INFO=${EXTRA_TAG_INFO:-""} docker build -f ${IMAGE}/Dockerfile.${DISTRO} --network=host -t ${REGISTRY_URI}${IMAGE}:${VERSION}-${DISTRO}${EXTRA_TAG_INFO} ${extra_build_args} ${IMAGE}