From 88124dffb919781b2decb1fc3b9cf70f0ad22a59 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 6 Apr 2020 14:29:24 +1000 Subject: [PATCH] Update Fedora to 31 Update the Fedora test platform to 31. Since we have dropped the pip-and-virtualenv element with this image, we do not need the work-around for excluded packages any more. Story: #2007386 Task: #39310 Change-Id: I713a3cc790039dee3d28d83198f5afff5bebc491 --- roles/ensure-pip/tasks/RedHat.yaml | 21 ---------------- tools/update-test-platforms.py | 2 +- zuul-tests.d/general-roles-jobs.yaml | 36 ++++++++++++++-------------- zuul-tests.d/go-jobs.yaml | 12 +++++----- zuul-tests.d/packer-jobs.yaml | 12 +++++----- zuul-tests.d/python-jobs.yaml | 24 +++++++++---------- zuul-tests.d/python-roles-jobs.yaml | 12 +++++----- 7 files changed, 49 insertions(+), 70 deletions(-) diff --git a/roles/ensure-pip/tasks/RedHat.yaml b/roles/ensure-pip/tasks/RedHat.yaml index 4f9021baf..cf976ce14 100644 --- a/roles/ensure-pip/tasks/RedHat.yaml +++ b/roles/ensure-pip/tasks/RedHat.yaml @@ -1,23 +1,3 @@ -# NOTE(ianw) : Skip attempting installation if the package is -# excluded. This is a temporary workaround for nodes that use -# pip-and-virtualenv and pre-install python3-pip but place it in the -# excludes list. In this case, the "package: " call will fail on -# dnf/Fedora because it notices it is excluded. Doesn't seem to -# happen with yum or even centos8 era dnf. Can go away when we stop -# this on the base nodes. -- name: Read dnf.conf - shell: | - if [[ -e /etc/dnf/dnf.conf ]]; then - if grep -e 'exclude=.*python3-pip' /etc/dnf/dnf.conf; then - exit 1 - else - exit 0 - fi - fi - exit 0 - failed_when: false - register: _pkg_excluded - - name: Install Python 3 pip package: name: @@ -25,7 +5,6 @@ - python3-setuptools state: present when: - - _pkg_excluded.rc == 0 - ansible_python.version.major == 3 become: yes diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index ea64b7f3f..ea9387ea3 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -32,7 +32,7 @@ PLATFORMS = [ 'centos-7', 'centos-8', 'debian-stretch', - 'fedora-30', + 'fedora-31', 'gentoo-17-0-systemd', 'opensuse-15', 'opensuse-tumbleweed', diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 285545f15..9fc7b3fde 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -155,14 +155,14 @@ label: debian-stretch - job: - name: zuul-jobs-test-base-roles-fedora-30 - description: Tests roles in the 'base' job on fedora-30 + name: zuul-jobs-test-base-roles-fedora-31 + description: Tests roles in the 'base' job on fedora-31 parent: zuul-jobs-test-base-roles tags: auto-generated nodeset: nodes: - - name: fedora-30 - label: fedora-30 + - name: fedora-31 + label: fedora-31 - job: name: zuul-jobs-test-base-roles-gentoo-17-0-systemd @@ -271,14 +271,14 @@ label: debian-stretch - job: - name: zuul-jobs-test-bindep-fedora-30 - description: Test the bindep role on fedora-30 + name: zuul-jobs-test-bindep-fedora-31 + description: Test the bindep role on fedora-31 parent: zuul-jobs-test-bindep tags: auto-generated nodeset: nodes: - - name: fedora-30 - label: fedora-30 + - name: fedora-31 + label: fedora-31 - job: name: zuul-jobs-test-bindep-gentoo-17-0-systemd @@ -457,16 +457,16 @@ - secondary - job: - name: zuul-jobs-test-multinode-roles-fedora-30 - description: Tests multinode setup roles on fedora-30 + name: zuul-jobs-test-multinode-roles-fedora-31 + description: Tests multinode setup roles on fedora-31 parent: zuul-jobs-test-multinode-roles tags: auto-generated nodeset: nodes: - name: primary - label: fedora-30 + label: fedora-31 - name: secondary - label: fedora-30 + label: fedora-31 groups: - name: switch nodes: @@ -621,7 +621,7 @@ - zuul-jobs-test-base-roles-centos-7 - zuul-jobs-test-base-roles-centos-8 - zuul-jobs-test-base-roles-debian-stretch - - zuul-jobs-test-base-roles-fedora-30 + - zuul-jobs-test-base-roles-fedora-31 - zuul-jobs-test-base-roles-gentoo-17-0-systemd - zuul-jobs-test-base-roles-opensuse-15 - zuul-jobs-test-base-roles-opensuse-tumbleweed-nv @@ -631,7 +631,7 @@ - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 - zuul-jobs-test-bindep-debian-stretch - - zuul-jobs-test-bindep-fedora-30 + - zuul-jobs-test-bindep-fedora-31 - zuul-jobs-test-bindep-gentoo-17-0-systemd - zuul-jobs-test-bindep-opensuse-15 - zuul-jobs-test-bindep-opensuse-tumbleweed-nv @@ -645,7 +645,7 @@ - zuul-jobs-test-multinode-roles-centos-7 - zuul-jobs-test-multinode-roles-centos-8 - zuul-jobs-test-multinode-roles-debian-stretch - - zuul-jobs-test-multinode-roles-fedora-30 + - zuul-jobs-test-multinode-roles-fedora-31 - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd - zuul-jobs-test-multinode-roles-opensuse-15 - zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv @@ -662,7 +662,7 @@ - zuul-jobs-test-base-roles-centos-7 - zuul-jobs-test-base-roles-centos-8 - zuul-jobs-test-base-roles-debian-stretch - - zuul-jobs-test-base-roles-fedora-30 + - zuul-jobs-test-base-roles-fedora-31 - zuul-jobs-test-base-roles-gentoo-17-0-systemd - zuul-jobs-test-base-roles-opensuse-15 - zuul-jobs-test-base-roles-ubuntu-bionic @@ -670,7 +670,7 @@ - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 - zuul-jobs-test-bindep-debian-stretch - - zuul-jobs-test-bindep-fedora-30 + - zuul-jobs-test-bindep-fedora-31 - zuul-jobs-test-bindep-gentoo-17-0-systemd - zuul-jobs-test-bindep-opensuse-15 - zuul-jobs-test-bindep-ubuntu-bionic @@ -682,7 +682,7 @@ - zuul-jobs-test-multinode-roles-centos-7 - zuul-jobs-test-multinode-roles-centos-8 - zuul-jobs-test-multinode-roles-debian-stretch - - zuul-jobs-test-multinode-roles-fedora-30 + - zuul-jobs-test-multinode-roles-fedora-31 - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd - zuul-jobs-test-multinode-roles-opensuse-15 - zuul-jobs-test-multinode-roles-ubuntu-bionic diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml index e071d9e25..2deaf4cb0 100644 --- a/zuul-tests.d/go-jobs.yaml +++ b/zuul-tests.d/go-jobs.yaml @@ -47,14 +47,14 @@ label: debian-stretch - job: - name: zuul-jobs-test-golang-go-fedora-30 - description: Test the golang-go job on fedora-30 + name: zuul-jobs-test-golang-go-fedora-31 + description: Test the golang-go job on fedora-31 parent: zuul-jobs-test-golang-go tags: auto-generated nodeset: nodes: - - name: fedora-30 - label: fedora-30 + - name: fedora-31 + label: fedora-31 - job: name: zuul-jobs-test-golang-go-gentoo-17-0-systemd @@ -124,7 +124,7 @@ - zuul-jobs-test-golang-go-centos-7 - zuul-jobs-test-golang-go-centos-8 - zuul-jobs-test-golang-go-debian-stretch - - zuul-jobs-test-golang-go-fedora-30 + - zuul-jobs-test-golang-go-fedora-31 - zuul-jobs-test-golang-go-gentoo-17-0-systemd - zuul-jobs-test-golang-go-opensuse-15 - zuul-jobs-test-golang-go-opensuse-tumbleweed-nv @@ -136,7 +136,7 @@ - zuul-jobs-test-golang-go-centos-7 - zuul-jobs-test-golang-go-centos-8 - zuul-jobs-test-golang-go-debian-stretch - - zuul-jobs-test-golang-go-fedora-30 + - zuul-jobs-test-golang-go-fedora-31 - zuul-jobs-test-golang-go-gentoo-17-0-systemd - zuul-jobs-test-golang-go-opensuse-15 - zuul-jobs-test-golang-go-ubuntu-bionic diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml index 038853680..b464d05f4 100644 --- a/zuul-tests.d/packer-jobs.yaml +++ b/zuul-tests.d/packer-jobs.yaml @@ -48,14 +48,14 @@ label: debian-stretch - job: - name: test-packer-fedora-30 - description: Test packer job on fedora-30 + name: test-packer-fedora-31 + description: Test packer job on fedora-31 parent: test-packer tags: auto-generated nodeset: nodes: - - name: fedora-30 - label: fedora-30 + - name: fedora-31 + label: fedora-31 - job: name: test-packer-gentoo-17-0-systemd @@ -125,7 +125,7 @@ - test-packer-centos-7 - test-packer-centos-8 - test-packer-debian-stretch - - test-packer-fedora-30 + - test-packer-fedora-31 - test-packer-gentoo-17-0-systemd - test-packer-opensuse-15 - test-packer-opensuse-tumbleweed-nv @@ -137,7 +137,7 @@ - test-packer-centos-7 - test-packer-centos-8 - test-packer-debian-stretch - - test-packer-fedora-30 + - test-packer-fedora-31 - test-packer-gentoo-17-0-systemd - test-packer-opensuse-15 - test-packer-ubuntu-bionic diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index 5cf7ee7ae..42ab1a49d 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -37,14 +37,14 @@ label: debian-stretch - job: - name: zuul-jobs-test-ensure-pip-fedora-30 - description: Test the ensure-pip role on fedora-30 + name: zuul-jobs-test-ensure-pip-fedora-31 + description: Test the ensure-pip role on fedora-31 parent: zuul-jobs-test-ensure-pip tags: auto-generated nodeset: nodes: - - name: fedora-30 - label: fedora-30 + - name: fedora-31 + label: fedora-31 - job: name: zuul-jobs-test-ensure-pip-gentoo-17-0-systemd @@ -157,14 +157,14 @@ label: debian-stretch - job: - name: zuul-jobs-test-ensure-tox-fedora-30 - description: Test the ensure-tox role on fedora-30 + name: zuul-jobs-test-ensure-tox-fedora-31 + description: Test the ensure-tox role on fedora-31 parent: zuul-jobs-test-ensure-tox tags: auto-generated nodeset: nodes: - - name: fedora-30 - label: fedora-30 + - name: fedora-31 + label: fedora-31 - job: name: zuul-jobs-test-ensure-tox-gentoo-17-0-systemd @@ -289,7 +289,7 @@ - zuul-jobs-test-ensure-pip-centos-7 - zuul-jobs-test-ensure-pip-centos-8 - zuul-jobs-test-ensure-pip-debian-stretch - - zuul-jobs-test-ensure-pip-fedora-30 + - zuul-jobs-test-ensure-pip-fedora-31 - zuul-jobs-test-ensure-pip-gentoo-17-0-systemd - zuul-jobs-test-ensure-pip-opensuse-15 - zuul-jobs-test-ensure-pip-opensuse-tumbleweed-nv @@ -300,7 +300,7 @@ - zuul-jobs-test-ensure-tox-centos-7 - zuul-jobs-test-ensure-tox-centos-8 - zuul-jobs-test-ensure-tox-debian-stretch - - zuul-jobs-test-ensure-tox-fedora-30 + - zuul-jobs-test-ensure-tox-fedora-31 - zuul-jobs-test-ensure-tox-gentoo-17-0-systemd - zuul-jobs-test-ensure-tox-opensuse-15 - zuul-jobs-test-ensure-tox-opensuse-tumbleweed-nv @@ -317,7 +317,7 @@ - zuul-jobs-test-ensure-pip-centos-7 - zuul-jobs-test-ensure-pip-centos-8 - zuul-jobs-test-ensure-pip-debian-stretch - - zuul-jobs-test-ensure-pip-fedora-30 + - zuul-jobs-test-ensure-pip-fedora-31 - zuul-jobs-test-ensure-pip-gentoo-17-0-systemd - zuul-jobs-test-ensure-pip-opensuse-15 - zuul-jobs-test-ensure-pip-ubuntu-bionic @@ -326,7 +326,7 @@ - zuul-jobs-test-ensure-tox-centos-7 - zuul-jobs-test-ensure-tox-centos-8 - zuul-jobs-test-ensure-tox-debian-stretch - - zuul-jobs-test-ensure-tox-fedora-30 + - zuul-jobs-test-ensure-tox-fedora-31 - zuul-jobs-test-ensure-tox-gentoo-17-0-systemd - zuul-jobs-test-ensure-tox-opensuse-15 - zuul-jobs-test-ensure-tox-ubuntu-bionic diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml index 47a4d61b5..a4a992455 100644 --- a/zuul-tests.d/python-roles-jobs.yaml +++ b/zuul-tests.d/python-roles-jobs.yaml @@ -37,14 +37,14 @@ label: debian-stretch - job: - name: zuul-jobs-test-ensure-python-pyenv-fedora-30 - description: Test the ensure-python role with pyenv on fedora-30 + name: zuul-jobs-test-ensure-python-pyenv-fedora-31 + description: Test the ensure-python role with pyenv on fedora-31 parent: zuul-jobs-test-ensure-python-pyenv tags: auto-generated nodeset: nodes: - - name: fedora-30 - label: fedora-30 + - name: fedora-31 + label: fedora-31 - job: name: zuul-jobs-test-ensure-python-pyenv-gentoo-17-0-systemd @@ -114,7 +114,7 @@ - zuul-jobs-test-ensure-python-pyenv-centos-7 - zuul-jobs-test-ensure-python-pyenv-centos-8 - zuul-jobs-test-ensure-python-pyenv-debian-stretch - - zuul-jobs-test-ensure-python-pyenv-fedora-30 + - zuul-jobs-test-ensure-python-pyenv-fedora-31 - zuul-jobs-test-ensure-python-pyenv-gentoo-17-0-systemd - zuul-jobs-test-ensure-python-pyenv-opensuse-15 - zuul-jobs-test-ensure-python-pyenv-opensuse-tumbleweed-nv @@ -126,7 +126,7 @@ - zuul-jobs-test-ensure-python-pyenv-centos-7 - zuul-jobs-test-ensure-python-pyenv-centos-8 - zuul-jobs-test-ensure-python-pyenv-debian-stretch - - zuul-jobs-test-ensure-python-pyenv-fedora-30 + - zuul-jobs-test-ensure-python-pyenv-fedora-31 - zuul-jobs-test-ensure-python-pyenv-gentoo-17-0-systemd - zuul-jobs-test-ensure-python-pyenv-opensuse-15 - zuul-jobs-test-ensure-python-pyenv-ubuntu-bionic