Merge "Remove usage of ubuntu xenial"

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 \

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
 

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}

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}

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"}

tempest/Dockerfile.ubuntu_xenial

@@ -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/ ;\

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}