Update gates

* Use bionic for ussuri build as it's the latest supported
release [0][1].
* Switch to centos 8 to run master [1][2].
* Switch default base image to ubuntu:focal.

[0] https://governance.openstack.org/tc/reference/runtimes/ussuri.html
[1] https://governance.openstack.org/tc/reference/runtimes/victoria.html
[2] https://governance.openstack.org/tc/reference/runtimes/train.html

Change-Id: I9a70aebd9636e170c6e04398356933668a2bfbba
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
This commit is contained in:
Andrii Ostapenko
2021-10-12 05:21:05 +00:00
committed by Andrii Ostapenko
parent 68c3d9177f
commit a61c73e9b2
6 changed files with 190 additions and 176 deletions

View File

@@ -1,4 +1,4 @@
ARG FROM=ubuntu:bionic ARG FROM=ubuntu:focal
FROM ${FROM} FROM ${FROM}
ENV PATH=/var/lib/openstack/bin:$PATH ENV PATH=/var/lib/openstack/bin:$PATH

View File

@@ -99,12 +99,14 @@ mod_auth_mellon [platform:rpm (keystone apache mellon)]
mod_auth_openidc [platform:rpm (keystone apache openidc)] mod_auth_openidc [platform:rpm (keystone apache openidc)]
mod_ssl [platform:rpm !platform:suse apache] mod_ssl [platform:rpm !platform:suse apache]
mod_wsgi [platform:rpm apache] mod_wsgi [platform:rpm apache]
mozilla-nss-devel [platform:suse requirements] # latest nss-devel breaks python-nss on leap15
mozilla-nss-devel-3.53.1-lp152.2.7.1 [platform:suse requirements]
multipath-tools [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)] multipath-tools [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)]
mysql [platform:rpm placement] mysql [platform:rpm placement]
mysql-client [platform:dpkg placement] mysql-client [platform:dpkg placement]
nginx [nginx] nginx [nginx]
nss-devel [platform:rpm !platform:suse requirements] # latest nss-devel breaks python-nss on centos:8
nss-devel-3.53.1-17.el8_3 [platform:rpm !platform:suse requirements]
nss-util [platform:rpm !platform:suse requirements] nss-util [platform:rpm !platform:suse requirements]
open-iscsi [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)] open-iscsi [platform:dpkg platform:suse (cinder purestorage) (nova purestorage)]
openldap [platform:rpm !platform:suse (keystone ldap !python3)] openldap [platform:rpm !platform:suse (keystone ldap !python3)]

View File

@@ -1,23 +1,29 @@
[base] [appstream]
name=CentOS-$releasever - Base name=CentOS Linux $releasever - AppStream
baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/os/$basearch/ baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/AppStream/$basearch/os/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[updates] [baseos]
name=CentOS-$releasever - Updates name=CentOS Linux $releasever - BaseOS
baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/updates/$basearch/ baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/BaseOS/$basearch/os/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[extras] [extras]
name=CentOS-$releasever - Extras name=CentOS Linux $releasever - Extras
baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/extras/$basearch/ baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/extras/$basearch/os/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[powertools]
name=CentOS Linux $releasever - PowerTools
baseurl=http://%%PACKAGE_MIRROR%%/$contentdir/$releasever/PowerTools/$basearch/os/
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
[openstack] [openstack]
name=CentOS-$releasever - OpenStack name=CentOS-$releasever - OpenStack
baseurl=http://%%PACKAGE_MIRROR%%/centos/\$releasever/cloud/$basearch/openstack-stein/ baseurl=http://%%PACKAGE_MIRROR%%/centos/$releasever/cloud/$basearch/openstack-victoria/
gpgcheck=1 gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-SIG-Cloud

View File

@@ -1,4 +1,4 @@
ARG FROM=centos:7 ARG FROM=centos:8
FROM ${FROM} FROM ${FROM}
ARG PACKAGE_MIRROR=mirror.centos.org ARG PACKAGE_MIRROR=mirror.centos.org
@@ -11,5 +11,6 @@ RUN rm -rf /etc/yum.repos.d/*
COPY CentOS.repo /etc/yum.repos.d/ COPY CentOS.repo /etc/yum.repos.d/
COPY RPM-GPG-KEY-CentOS-SIG-Cloud /etc/pki/rpm-gpg/ COPY RPM-GPG-KEY-CentOS-SIG-Cloud /etc/pki/rpm-gpg/
RUN sed -i "s|%%PACKAGE_MIRROR%%|${PACKAGE_MIRROR}|g" /etc/yum.repos.d/CentOS.repo \ RUN sed -i "s|%%PACKAGE_MIRROR%%|${PACKAGE_MIRROR}|g" /etc/yum.repos.d/CentOS.repo \
&& yum install -y centos-release-qemu-ev \
&& yum update -y && yum update -y
# NOTE(aostapenko) repositories are restored on yum update, deleting them again
RUN find /etc/yum.repos.d/ -type f ! -name 'CentOS.repo' -delete

View File

@@ -20,7 +20,7 @@ loci_src_dir: "src/opendev.org/openstack/loci"
distros: distros:
- name: centos - name: centos
image: centos:7 image: centos:8
release: master release: master
buildargs: buildargs:
base: base:
@@ -62,7 +62,7 @@ distros:
PYTHON3: yes PYTHON3: yes
- name: ubuntu_bionic - name: ubuntu_bionic
image: ubuntu:bionic image: ubuntu:bionic
release: master release: ussuri
buildargs: buildargs:
base: base:
UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/ UBUNTU_URL: http://{{ zuul_site_mirror_fqdn }}/ubuntu/
@@ -74,7 +74,7 @@ distros:
project: project:
PROJECT: "{{ project }}" PROJECT: "{{ project }}"
PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }} PROJECT_REPO: http://172.17.0.1/git/openstack/{{ project }}
WHEELS: 172.17.0.1:5000/loci/requirements:master-ubuntu_bionic WHEELS: 172.17.0.1:5000/loci/requirements:ussuri-ubuntu_bionic
FROM: base:ubuntu_bionic FROM: base:ubuntu_bionic
PYTHON3: yes PYTHON3: yes
requirements: requirements:

View File

@@ -23,6 +23,11 @@ fi
# anymore # anymore
sed -i '/python-qpid-proton===0.14.0/d' /upper-constraints.txt sed -i '/python-qpid-proton===0.14.0/d' /upper-constraints.txt
# Setuptools from constraints is not compatible with other constrainted packages
[[ "${PROJECT_REF}" == "master" ]] && sed -i '/setuptools/d' /upper-constraints.txt
# https://review.opendev.org/c/openstack/requirements/+/813693
[[ "${PYTHON3}" != "no" ]] && sed -i '/^futures===/d' /upper-constraints.txt
# Remove trollius 2.1 because of multiple problems: # Remove trollius 2.1 because of multiple problems:
# - It is not published on pypi anymore (only 2.1.post2 is) # - It is not published on pypi anymore (only 2.1.post2 is)
# - Trollius is a py2 only software, and the current requirement from # - Trollius is a py2 only software, and the current requirement from