CI: Remove centos-7 jobs
CentOS 7 will go EOL later this year, and infra wants to drop the nodes soon-ish -- don't make them wait on our account. The only major loss is py2 probe tests, but officially, yoga was the last release we pledged to support py2. Change-Id: I8f6c247c21f16aa4717569cc69308f846c6a0245
This commit is contained in:
parent
275af9e008
commit
bd3b2256a9
52
.zuul.yaml
52
.zuul.yaml
@ -28,14 +28,6 @@
|
|||||||
python_version: 2.7
|
python_version: 2.7
|
||||||
post-run: tools/playbooks/common/cover-post.yaml
|
post-run: tools/playbooks/common/cover-post.yaml
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-py27-centos-7
|
|
||||||
parent: openstack-tox-py27
|
|
||||||
nodeset: centos-7
|
|
||||||
vars:
|
|
||||||
tox_environment:
|
|
||||||
TMPDIR: '{{ ansible_env.HOME }}/xfstmp'
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-tox-py36
|
name: swift-tox-py36
|
||||||
parent: swift-tox-base
|
parent: swift-tox-base
|
||||||
@ -250,12 +242,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: func-ec-py3
|
tox_envlist: func-ec-py3
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-func-py27-centos-7
|
|
||||||
parent: swift-tox-py27-centos-7
|
|
||||||
vars:
|
|
||||||
tox_envlist: func
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-tox-func-encryption-py27
|
name: swift-tox-func-encryption-py27
|
||||||
parent: swift-tox-func-py27
|
parent: swift-tox-func-py27
|
||||||
@ -268,12 +254,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: func-encryption
|
tox_envlist: func-encryption
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-func-encryption-py27-centos-7
|
|
||||||
parent: swift-tox-func-py27-centos-7
|
|
||||||
vars:
|
|
||||||
tox_envlist: func-encryption
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-tox-func-ec-py27
|
name: swift-tox-func-ec-py27
|
||||||
parent: swift-tox-func-py27
|
parent: swift-tox-func-py27
|
||||||
@ -286,12 +266,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: func-ec
|
tox_envlist: func-ec
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-tox-func-ec-py27-centos-7
|
|
||||||
parent: swift-tox-func-py27-centos-7
|
|
||||||
vars:
|
|
||||||
tox_envlist: func-ec
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-dsvm-functional
|
name: swift-dsvm-functional
|
||||||
parent: devstack-minimal
|
parent: devstack-minimal
|
||||||
@ -373,22 +347,6 @@
|
|||||||
post-run:
|
post-run:
|
||||||
- tools/playbooks/probetests/post.yaml
|
- tools/playbooks/probetests/post.yaml
|
||||||
|
|
||||||
- job:
|
|
||||||
name: swift-probetests-centos-7
|
|
||||||
parent: swift-probetests-centos-8-stream
|
|
||||||
nodeset: centos-7
|
|
||||||
description: |
|
|
||||||
Setup a SAIO dev environment and run Swift's probe tests
|
|
||||||
under Python 2.
|
|
||||||
vars:
|
|
||||||
bindep_profile: test py27
|
|
||||||
ensure_pip_from_packages: False
|
|
||||||
ensure_pip_from_packages_with_python2: False
|
|
||||||
ensure_pip_from_upstream: True
|
|
||||||
ensure_pip_from_upstream_interpreters:
|
|
||||||
- python2
|
|
||||||
ensure_pip_from_upstream_url: "https://bootstrap.pypa.io/pip/2.7/get-pip.py"
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: swift-probetests-centos-8-stream
|
name: swift-probetests-centos-8-stream
|
||||||
parent: unittests
|
parent: unittests
|
||||||
@ -757,15 +715,13 @@
|
|||||||
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
|
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
|
||||||
- ^test/(cors|unit|functional|probe)/.*$
|
- ^test/(cors|unit|functional|probe)/.*$
|
||||||
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
||||||
- swift-probetests-centos-7:
|
- swift-probetests-centos-8-stream:
|
||||||
irrelevant-files: &probetest-irrelevant-files
|
irrelevant-files: &probetest-irrelevant-files
|
||||||
- ^(api-ref|releasenotes)/.*$
|
- ^(api-ref|releasenotes)/.*$
|
||||||
# Keep doc/saio -- we use those sample configs in the saio playbooks
|
# Keep doc/saio -- we use those sample configs in the saio playbooks
|
||||||
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
|
- ^doc/(requirements.txt|(manpages|s3api|source)/.*)$
|
||||||
- ^test/(cors|unit|functional|s3api)/.*$
|
- ^test/(cors|unit|functional|s3api)/.*$
|
||||||
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
- ^(.gitreview|.mailmap|AUTHORS|CHANGELOG|.*\.rst)$
|
||||||
- swift-probetests-centos-8-stream:
|
|
||||||
irrelevant-files: *probetest-irrelevant-files
|
|
||||||
- swift-dsvm-functional:
|
- swift-dsvm-functional:
|
||||||
irrelevant-files: *functest-irrelevant-files
|
irrelevant-files: *functest-irrelevant-files
|
||||||
- swift-dsvm-functional-ipv6:
|
- swift-dsvm-functional-ipv6:
|
||||||
@ -816,8 +772,6 @@
|
|||||||
- swift-tox-func-ec-py38
|
- swift-tox-func-ec-py38
|
||||||
- swift-func-cors
|
- swift-func-cors
|
||||||
- swift-tox-func-s3api-tests-tempauth
|
- swift-tox-func-s3api-tests-tempauth
|
||||||
- swift-probetests-centos-7:
|
|
||||||
irrelevant-files: *probetest-irrelevant-files
|
|
||||||
- swift-probetests-centos-8-stream:
|
- swift-probetests-centos-8-stream:
|
||||||
irrelevant-files: *probetest-irrelevant-files
|
irrelevant-files: *probetest-irrelevant-files
|
||||||
- swift-dsvm-functional:
|
- swift-dsvm-functional:
|
||||||
@ -842,10 +796,6 @@
|
|||||||
jobs:
|
jobs:
|
||||||
- swift-tox-py37
|
- swift-tox-py37
|
||||||
- swift-tox-py38
|
- swift-tox-py38
|
||||||
- swift-tox-py27-centos-7
|
|
||||||
- swift-tox-func-py27-centos-7
|
|
||||||
- swift-tox-func-encryption-py27-centos-7
|
|
||||||
- swift-tox-func-ec-py27-centos-7
|
|
||||||
- swift-tox-py36-centos-8-stream
|
- swift-tox-py36-centos-8-stream
|
||||||
- swift-tox-func-py39-centos-9-stream
|
- swift-tox-func-py39-centos-9-stream
|
||||||
- swift-tox-func-encryption-py39-centos-9-stream
|
- swift-tox-func-encryption-py39-centos-9-stream
|
||||||
|
@ -17,11 +17,9 @@
|
|||||||
roles:
|
roles:
|
||||||
- ensure-pip
|
- ensure-pip
|
||||||
tasks:
|
tasks:
|
||||||
- name: upgrade pip, but not too far
|
- name: upgrade pip
|
||||||
pip:
|
pip:
|
||||||
# 20.* works on both py2 and py3, and the pip for centos7 in EPEL
|
name: pip
|
||||||
# isn't smart enough to prevent us upgrading to 21+
|
|
||||||
name: pip<21
|
|
||||||
extra_args: --upgrade
|
extra_args: --upgrade
|
||||||
|
|
||||||
- name: install rsync-daemon - CentOS 8
|
- name: install rsync-daemon - CentOS 8
|
||||||
@ -35,27 +33,11 @@
|
|||||||
- name: install python modules with pip
|
- name: install python modules with pip
|
||||||
pip: name={{ item }} state=present extra_args='--upgrade'
|
pip: name={{ item }} state=present extra_args='--upgrade'
|
||||||
with_items:
|
with_items:
|
||||||
# For some reason, pip on py2 isn't smart enough to prevent us
|
- mock
|
||||||
# trying to install a too-new mock or attrs??
|
- crudini
|
||||||
- 'mock<4'
|
|
||||||
- 'attrs<22.1.0'
|
|
||||||
# crudini pulls in iniparse which can conflict with distro-installed
|
|
||||||
# packages on centos7
|
|
||||||
- 'crudini<0.9.4'
|
|
||||||
# Order matters; install constrained versions *first*, then unconstrained
|
|
||||||
- eventlet
|
- eventlet
|
||||||
- pyeclib
|
- pyeclib
|
||||||
- pytest
|
- pytest
|
||||||
- pytest-cov
|
- pytest-cov
|
||||||
- python-swiftclient
|
- python-swiftclient
|
||||||
- 'boto3>=1.9'
|
- 'boto3>=1.9'
|
||||||
|
|
||||||
- name: install PasteDeploy - CentOS 7
|
|
||||||
pip: name={{ item }} state=present extra_args='--upgrade'
|
|
||||||
with_items:
|
|
||||||
# py2_constraints won't be obeyed by pip install swift
|
|
||||||
- 'PasteDeploy==2.1.1'
|
|
||||||
- 'python-dateutil==2.8.2'
|
|
||||||
when:
|
|
||||||
- ansible_facts['distribution'] == "CentOS"
|
|
||||||
- ansible_facts['distribution_major_version'] == "7"
|
|
||||||
|
@ -15,11 +15,6 @@ sudo chmod 777 $HOME/xfstmp
|
|||||||
|
|
||||||
# Install liberasurecode-devel for CentOS from RDO repository.
|
# Install liberasurecode-devel for CentOS from RDO repository.
|
||||||
|
|
||||||
function is_rhel7 {
|
|
||||||
[ -f /usr/bin/yum ] && \
|
|
||||||
cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
|
|
||||||
cat /etc/*release | grep -q 'release 7'
|
|
||||||
}
|
|
||||||
function is_rhel8 {
|
function is_rhel8 {
|
||||||
[ -f /usr/bin/dnf ] && \
|
[ -f /usr/bin/dnf ] && \
|
||||||
cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
|
cat /etc/*release | grep -q -e "Red Hat" -e "CentOS" -e "CloudLinux" && \
|
||||||
@ -32,13 +27,6 @@ function is_rhel9 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if is_rhel7; then
|
|
||||||
# Install CentOS OpenStack repos so that we have access to some extra
|
|
||||||
# packages.
|
|
||||||
sudo yum install -y centos-release-openstack-rocky
|
|
||||||
sudo yum install -y liberasurecode-devel
|
|
||||||
fi
|
|
||||||
|
|
||||||
if is_rhel8; then
|
if is_rhel8; then
|
||||||
# Install CentOS OpenStack repos so that we have access to some extra
|
# Install CentOS OpenStack repos so that we have access to some extra
|
||||||
# packages.
|
# packages.
|
||||||
|
Loading…
Reference in New Issue
Block a user