openstack/loci
Code Issues Proposed changes

Reduce build targets

Browse Source 
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
This commit is contained in:
Mohammed Naser 2021-07-20 15:49:25 -04:00 committed by Gage Hugo
parent eb95b4adab
commit 9e7b71c304
10 changed files with 5 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -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")

23
dockerfiles/debian/Dockerfile
View File

@ -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

BIN
dockerfiles/debian/ceph.gpg
View File

Binary file not shown.

5
dockerfiles/debian/sources.list
View File

@ -1,5 +0,0 @@
deb %%DEBIAN_URL%% stretch main
deb %%DEBIAN_URL%% stretch-updates main
deb %%DEBIAN_URL%% stretch-backports main
deb %%DEBIAN_SECURITY_URL%% %%DEBIAN_SECURITY_DISTRIBUTION%% main
deb %%CEPH_URL%% stretch main

10
dockerfiles/leap15/Dockerfile
View File

@ -1,10 +0,0 @@
ARG FROM=opensuse/leap:15.2
FROM ${FROM}
ARG PACKAGE_MIRROR=http://download.opensuse.org/
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}
RUN for filename in $(grep -Rl enabled=1 /etc/zypp/repos.d/); do sed -i "s|http://download.opensuse.org/|${PACKAGE_MIRROR}|" $filename; done && zypper refresh && zypper up -y && zypper install -y tar gzip which unzip

17
playbooks/vars.yaml
View File

@ -80,19 +80,4 @@ distros:
FROM: base:ubuntu_bionic
PROJECT_REF: "stable/ussuri"
PROJECT_RELEASE: "ussuri"
# - name: leap15
# release: master
# buildargs:
# base:
# PACKAGE_MIRROR: "http://{{ zuul_site_mirror_fqdn }}/opensuse/"
# PIP_INDEX_URL: http://{{ zuul_site_mirror_fqdn }}/pypi/simple
# PIP_TRUSTED_HOST: "{{ zuul_site_mirror_fqdn }}"
# project:
# PROJECT: "{{ project }}"
# PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
# WHEELS: 172.17.0.1:5000/loci/requirements:master-leap15
# FROM: base:leap15
# requirements:
# PROJECT: requirements
# PROJECT_REPO: http://172.17.0.1/git/openstack/requirements
# FROM: base:leap15
PYTHON3: yes

9
scripts/cleanup.sh
View File

@ -3,7 +3,7 @@
set -ex
case ${distro} in
debian|ubuntu)
ubuntu)
apt-get purge -y --auto-remove \
git \
patch \
@ -20,13 +20,6 @@ case ${distro} in
python3-virtualenv
yum clean all
;;
opensuse|opensuse-leap|opensuse-tumbleweed|sles)
zypper remove -y --clean-deps \
git-core \
patch \
python3-virtualenv
zypper clean -a
;;
*)
echo "Unknown distro: ${distro}"
exit 1

5
scripts/collect_info.sh
View File

@ -8,15 +8,12 @@ PACKAGES_INFO="${INFO_DIR}/packages.txt"
PIP_INFO="${INFO_DIR}/pip.txt"
case ${distro} in
debian|ubuntu)
ubuntu)
dpkg -l > $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

19
scripts/install.sh
View File

@ -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

5
scripts/install_packages.sh
View File

@ -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