From 9e7b71c3043245baeae16ecc0c8f3563e2c25c98 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Tue, 20 Jul 2021 15:49:25 -0400 Subject: [PATCH] Reduce build targets OpenSUSE LEAP is currently not in use by any known downstream users and it has been broken for quite sometime, leaving the gate in a broken state and unable to land any code. There's no active maintainer for it as well. Debian support was added by us (VEXXHOST) but we decided that we're not going to continue using it and move towards Ubuntu, so we do not want to maintain it, as well as that it is building images for Train only. It also updates the README file accordingly as well as includes focal in there which has been recently added. Change-Id: Ideb497c169828184d301b6be4359a7c2228aa444 --- README.md | 4 ---- dockerfiles/debian/Dockerfile | 23 ----------------------- dockerfiles/debian/ceph.gpg | Bin 1143 -> 0 bytes dockerfiles/debian/sources.list | 5 ----- dockerfiles/leap15/Dockerfile | 10 ---------- playbooks/vars.yaml | 17 +---------------- scripts/cleanup.sh | 9 +-------- scripts/collect_info.sh | 5 +---- scripts/install.sh | 19 +------------------ scripts/install_packages.sh | 5 +---- 10 files changed, 5 insertions(+), 92 deletions(-) delete mode 100644 dockerfiles/debian/Dockerfile delete mode 100644 dockerfiles/debian/ceph.gpg delete mode 100644 dockerfiles/debian/sources.list delete mode 100644 dockerfiles/leap15/Dockerfile diff --git a/README.md b/README.md index b8ab5603..1d5672f1 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,6 @@ by LOCI. For simplicity, we will continue to use Keystone as an example. ### Keystone Image Layer Info CentOS: [![](https://images.microbadger.com/badges/version/loci/keystone:master-centos.svg)](https://microbadger.com/images/loci/keystone:master-centos "loci/keystone:master-centos") [![](https://images.microbadger.com/badges/image/loci/keystone:master-centos.svg)](https://microbadger.com/images/loci/keystone:master-centos "loci/keystone:master-centos") -Debian: [![](https://images.microbadger.com/badges/version/loci/keystone:master-debian.svg)](https://microbadger.com/images/loci/keystone:master-debian "loci/keystone:master-debian") [![](https://images.microbadger.com/badges/image/loci/keystone:master-debian.svg)](https://microbadger.com/images/loci/keystone:master-debian "loci/keystone:master-debian") - -openSUSE Leap: [![](https://images.microbadger.com/badges/version/loci/keystone:master-leap15.svg)](https://microbadger.com/images/loci/keystone:master-leap15 "loci/keystone:master-leap15") [![](https://images.microbadger.com/badges/image/loci/keystone:master-leap15.svg)](https://microbadger.com/images/loci/keystone:master-leap15 "loci/keystone:master-leap15") - Ubuntu: [![](https://images.microbadger.com/badges/version/loci/keystone:master-ubuntu.svg)](https://microbadger.com/images/loci/keystone:master-ubuntu "loci/keystone:master-ubuntu") [![](https://images.microbadger.com/badges/image/loci/keystone:master-ubuntu.svg)](https://microbadger.com/images/loci/keystone:master-ubuntu "loci/keystone:master-ubuntu") diff --git a/dockerfiles/debian/Dockerfile b/dockerfiles/debian/Dockerfile deleted file mode 100644 index 81ad6935..00000000 --- a/dockerfiles/debian/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -ARG FROM=debian:stretch -FROM ${FROM} - -ARG DEBIAN_URL=http://deb.debian.org/debian/ -ARG DEBIAN_SECURITY_URL=http://security.debian.org/debian-security/ -ARG DEBIAN_SECURITY_DISTRIBUTION=stretch/updates -ARG CEPH_URL=http://download.ceph.com/debian-nautilus/ -ARG ALLOW_UNAUTHENTICATED=false -ARG PIP_INDEX_URL=https://pypi.python.org/simple/ -ARG PIP_TRUSTED_HOST=pypi.python.org -ENV PIP_INDEX_URL=${PIP_INDEX_URL} -ENV PIP_TRUSTED_HOST=${PIP_TRUSTED_HOST} - -COPY sources.list /etc/apt/ -COPY ceph.gpg /etc/apt/trusted.gpg.d/ -RUN sed -i \ - -e "s|%%DEBIAN_URL%%|${DEBIAN_URL}|g" \ - -e "s|%%DEBIAN_SECURITY_URL%%|${DEBIAN_SECURITY_URL}|g" \ - -e "s|%%DEBIAN_SECURITY_DISTRIBUTION%%|${DEBIAN_SECURITY_DISTRIBUTION}|g" \ - -e "s|%%CEPH_URL%%|${CEPH_URL}|g" \ - /etc/apt/sources.list -RUN echo "APT::Get::AllowUnauthenticated \"${ALLOW_UNAUTHENTICATED}\";" \ - > /etc/apt/apt.conf.d/allow-unathenticated diff --git a/dockerfiles/debian/ceph.gpg b/dockerfiles/debian/ceph.gpg deleted file mode 100644 index c5d8bd399481b290ab5da94b87bd860a33a998ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1143 zcmV--1c>{Y0u2OJ_=X7q5CF@nevbJ;Y5AM5al>VI3*qGa#K5Hwm2!_RG#_465sD38 zmXL=NLCNO`29zsUcXOrn|9+`WxR5h*eY-hs=XvlKgzqt0XNxo>!;HCEyQjioviTGX z^63AwMTc%);z$XmJLkgYyK`nM1CAhp7WF|reYxYAEUs_~4Q5B}26ndxL?Y|$Cver? z+Ak9m`0ngIQ{q$*^Y!*xlNj-t_r%K}ODaaT?*Dqdu%y^KW0` zS6ZrG;)BP!1)?WS`!>M&$0zQz>J5}1&X7`S)dDqhl(43rss_qx06btgIkE2bedIgK z;xG~&^jzqnT9NUuM4z@q&^f(3x^B&MdjnVbuzE8k)(4)w_9NhYi0H9|H7&%3I2aEb zh+q>nquudzb_uOvKITzY;vyJtM-HU~wRly1j%tlK+D;M`D%KzpMT}47p0{w%J|&ag z`%O4cbnWhhSU^G^3k166X92k`)Mx`N5%~SD@}t(xyk<&8q|`J0Q(hA}UIj{x-8%<| z0)_&zqylwwJA`^hL=$>tqdyAJt<5pl;fJECl3s| zLE5}_)s5UcL0JG10RRECDnn&(Xf9)KZ6GLeWo%_(b7dfFWqBzeJac7Zb#iHRc|c=j zaA+=LZ*4w_0yqQ{0RjLb1p-z0h6w^20|pBT2nPcK1{DYb2?`4Y76JnS0v-VZ7k~f? z2@vQ?!oWrkIh0+}5CD%DJ;qE0XK&-rYVa)amGnqOoyNcMzwjac5aBU$X%%PBW>k6L z3D6G=<^q??a9MD*mjZ4qFl~`Thg{o{=i*$KoW(gzrFN}Hzst1V_~#iu>_a{YPUJt&wDrHV^U72%DSq=FIzI>(lJk(k^-4(U`{P77CyD0%bq>ih zZBB+Kwrh5L1y&6*F39>os1BoYq>c-<=+D;}#zj`0g9`;rl3rwz((Gm4pRg-QOdCnE z{s#VPSsvu@5RJh(cGcL-DgN-d^tmU(lfkmllZx7il#QTWeuJ+xp#6a@O21agV0i zaTeo!x%2r>B-Too>JJHr2)h%LYsHAn939f>LsAFu $PACKAGES_INFO ;; centos) yum list installed > $PACKAGES_INFO ;; - opensuse|opensuse-leap|opensuse-tumbleweed|sles) - zypper se --installed-only > $PACKAGES_INFO - ;; *) echo "Unknown distro: ${distro}" exit 1 diff --git a/scripts/install.sh b/scripts/install.sh index a5a31dc5..335c7002 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -18,7 +18,7 @@ else fi case ${distro} in - debian|ubuntu) + ubuntu) export LC_CTYPE=C.UTF-8 apt-get update if [[ ! -z "$(apt-cache search ^${python3}-distutils$)" ]]; then @@ -50,23 +50,6 @@ case ${distro} in pip3 install virtualenv fi ;; - opensuse|opensuse-leap|opensuse-tumbleweed|sles) - if [[ "${PYTHON3}" == "no" ]]; then - rpm_python_packages+=("python-devel" "python-setuptools") - else - rpm_python_packages+=("python3-devel" "python3-setuptools" - "python3-virtualenv") - fi - zypper --non-interactive --gpg-auto-import-keys refresh - zypper --non-interactive install --no-recommends \ - ca-certificates \ - git-core \ - lsb-release \ - patch \ - sudo \ - tar \ - ${rpm_python_packages[@]} - ;; *) echo "Unknown distro: ${distro}" exit 1 diff --git a/scripts/install_packages.sh b/scripts/install_packages.sh index cd9cac03..2534a422 100755 --- a/scripts/install_packages.sh +++ b/scripts/install_packages.sh @@ -12,7 +12,7 @@ done if [[ ! -z ${PACKAGES} ]]; then case ${distro} in - debian|ubuntu) + ubuntu) export DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ${PACKAGES[@]} ${DIST_PACKAGES} @@ -31,9 +31,6 @@ if [[ ! -z ${PACKAGES} ]]; then centos) yum -y --setopt=skip_missing_names_on_install=False install ${PACKAGES[@]} ${DIST_PACKAGES} ;; - opensuse|opensuse-leap|opensuse-tumbleweed|sles) - zypper --non-interactive install --no-recommends ${PACKAGES[@]} ${DIST_PACKAGES} - ;; *) echo "Unknown distro: ${distro}" exit 1