Skip to content

Commit

Permalink
Retire Fedora 31 for 32
Browse files Browse the repository at this point in the history
We have Fedora 32 nodes now, retire the Fedora 31 testing and replace
with 32.

Docker isn't supported on Fedora 32.  There's a problem with cgroups
v2 and you can read all about it at [1].  Drop the install test.

Haskell upstream has dropped F32 from the COPR repo as it is now
packaged; a new package with the correct dependencies has been pushed
but isn't available yet (see the inline github issue), so workaround
the missing package.

[1] docker/for-linux#955

Change-Id: I025613bee8c0a8513afa90331431d2c18b616464
  • Loading branch information
ianw committed Sep 17, 2020
1 parent 4d2c441 commit c5c9f7d
Show file tree
Hide file tree
Showing 11 changed files with 97 additions and 107 deletions.
14 changes: 7 additions & 7 deletions roles/ensure-haskell-stack/tasks/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
register: _stack_version

- block:
- name: Make sure dnf copr is installed
dnf:
name: dnf-command(copr)
become: true

- name: Install stack copr
command: dnf copr enable -y petersen/stack2
# This package is somehow missing from the requirements of the
# published packaged copr repo. See
# https://github.com/commercialhaskell/stack/issues/5388
- name: Preinstall gmp-devel
package:
name: gmp-devel
state: present
become: true

- name: Install stack
Expand Down
2 changes: 1 addition & 1 deletion tools/update-test-platforms.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
'centos-7',
'centos-8',
'debian-stretch',
'fedora-31',
'fedora-32',
'gentoo-17-0-systemd',
'opensuse-15',
'opensuse-tumbleweed',
Expand Down
20 changes: 5 additions & 15 deletions zuul-tests.d/container-roles-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,6 @@
- name: debian-stretch
label: debian-stretch

- job:
name: zuul-jobs-test-ensure-docker-fedora-31
description: Tests ensure-docker role on fedora-31
parent: zuul-jobs-test-ensure-docker
nodeset:
nodes:
- name: fedora-31
label: fedora-31

- job:
name: zuul-jobs-test-ensure-docker-ubuntu-bionic
description: Tests ensure-docker role on ubuntu-bionic
Expand Down Expand Up @@ -377,13 +368,13 @@
label: centos-8

- job:
name: zuul-jobs-test-ensure-podman-fedora-31
description: Tests ensure-podman role on fedora-31
name: zuul-jobs-test-ensure-podman-fedora-32
description: Tests ensure-podman role on fedora-32
parent: zuul-jobs-test-ensure-podman
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- job:
name: zuul-jobs-test-ensure-podman-ubuntu-bionic
Expand All @@ -405,7 +396,6 @@
- zuul-jobs-test-ensure-docker-centos-7
- zuul-jobs-test-ensure-docker-centos-8
- zuul-jobs-test-ensure-docker-debian-stretch
- zuul-jobs-test-ensure-docker-fedora-31
- zuul-jobs-test-ensure-docker-ubuntu-bionic
- zuul-jobs-test-ensure-docker-ubuntu-xenial
- zuul-jobs-test-ensure-docker-ubuntu-bionic-arm64
Expand All @@ -422,7 +412,7 @@
- zuul-jobs-test-ensure-kubernetes-docker
- zuul-jobs-test-ensure-kubernetes-crio
- zuul-jobs-test-ensure-podman-centos-8
- zuul-jobs-test-ensure-podman-fedora-31
- zuul-jobs-test-ensure-podman-fedora-32
- zuul-jobs-test-ensure-podman-ubuntu-bionic
gate:
jobs: *id001
40 changes: 20 additions & 20 deletions zuul-tests.d/general-roles-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@
label: debian-stretch

- job:
name: zuul-jobs-test-base-roles-fedora-31
description: Tests roles in the 'base' job on fedora-31
name: zuul-jobs-test-base-roles-fedora-32
description: Tests roles in the 'base' job on fedora-32
parent: zuul-jobs-test-base-roles
tags: auto-generated
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- job:
name: zuul-jobs-test-base-roles-gentoo-17-0-systemd
Expand Down Expand Up @@ -270,14 +270,14 @@
label: debian-stretch

- job:
name: zuul-jobs-test-bindep-fedora-31
description: Test the bindep role on fedora-31
name: zuul-jobs-test-bindep-fedora-32
description: Test the bindep role on fedora-32
parent: zuul-jobs-test-bindep
tags: auto-generated
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- job:
name: zuul-jobs-test-bindep-gentoo-17-0-systemd
Expand Down Expand Up @@ -455,16 +455,16 @@
- secondary

- job:
name: zuul-jobs-test-multinode-roles-fedora-31
description: Tests multinode setup roles on fedora-31
name: zuul-jobs-test-multinode-roles-fedora-32
description: Tests multinode setup roles on fedora-32
parent: zuul-jobs-test-multinode-roles
tags: auto-generated
nodeset:
nodes:
- name: primary
label: fedora-31
label: fedora-32
- name: secondary
label: fedora-31
label: fedora-32
groups:
- name: switch
nodes:
Expand Down Expand Up @@ -627,8 +627,8 @@
- test-playbooks/shake/setup-project.yaml
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

# -* AUTOGENERATED *-
# The following project section is autogenerated by
Expand All @@ -644,7 +644,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-31
- zuul-jobs-test-base-roles-fedora-32
- zuul-jobs-test-base-roles-gentoo-17-0-systemd
- zuul-jobs-test-base-roles-opensuse-15
- zuul-jobs-test-base-roles-opensuse-tumbleweed-nv
Expand All @@ -654,7 +654,7 @@
- zuul-jobs-test-bindep-centos-7
- zuul-jobs-test-bindep-centos-8
- zuul-jobs-test-bindep-debian-stretch
- zuul-jobs-test-bindep-fedora-31
- zuul-jobs-test-bindep-fedora-32
- zuul-jobs-test-bindep-gentoo-17-0-systemd
- zuul-jobs-test-bindep-opensuse-15
- zuul-jobs-test-bindep-opensuse-tumbleweed-nv
Expand All @@ -668,7 +668,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-31
- zuul-jobs-test-multinode-roles-fedora-32
- zuul-jobs-test-multinode-roles-gentoo-17-0-systemd-nv
- zuul-jobs-test-multinode-roles-opensuse-15
- zuul-jobs-test-multinode-roles-opensuse-tumbleweed-nv
Expand All @@ -687,7 +687,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-31
- zuul-jobs-test-base-roles-fedora-32
- zuul-jobs-test-base-roles-gentoo-17-0-systemd
- zuul-jobs-test-base-roles-opensuse-15
- zuul-jobs-test-base-roles-ubuntu-bionic
Expand All @@ -696,7 +696,7 @@
- zuul-jobs-test-bindep-centos-7
- zuul-jobs-test-bindep-centos-8
- zuul-jobs-test-bindep-debian-stretch
- zuul-jobs-test-bindep-fedora-31
- zuul-jobs-test-bindep-fedora-32
- zuul-jobs-test-bindep-gentoo-17-0-systemd
- zuul-jobs-test-bindep-opensuse-15
- zuul-jobs-test-bindep-ubuntu-bionic
Expand All @@ -709,7 +709,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-31
- zuul-jobs-test-multinode-roles-fedora-32
- zuul-jobs-test-multinode-roles-opensuse-15
- zuul-jobs-test-multinode-roles-ubuntu-bionic
- zuul-jobs-test-multinode-roles-ubuntu-xenial
Expand Down
12 changes: 6 additions & 6 deletions zuul-tests.d/go-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@
label: debian-stretch

- job:
name: zuul-jobs-test-golang-go-fedora-31
description: Test the golang-go job on fedora-31
name: zuul-jobs-test-golang-go-fedora-32
description: Test the golang-go job on fedora-32
parent: zuul-jobs-test-golang-go
tags: auto-generated
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- job:
name: zuul-jobs-test-golang-go-gentoo-17-0-systemd
Expand Down Expand Up @@ -123,7 +123,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-31
- zuul-jobs-test-golang-go-fedora-32
- zuul-jobs-test-golang-go-gentoo-17-0-systemd
- zuul-jobs-test-golang-go-opensuse-15
- zuul-jobs-test-golang-go-opensuse-tumbleweed-nv
Expand All @@ -135,7 +135,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-31
- zuul-jobs-test-golang-go-fedora-32
- zuul-jobs-test-golang-go-gentoo-17-0-systemd
- zuul-jobs-test-golang-go-opensuse-15
- zuul-jobs-test-golang-go-ubuntu-bionic
Expand Down
12 changes: 6 additions & 6 deletions zuul-tests.d/haskell.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
pre-run: test-playbooks/haskell/setup-project.yaml
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- job:
name: zuul-jobs-test-haskell-stack-test
Expand All @@ -26,8 +26,8 @@
pre-run: test-playbooks/haskell/setup-stack-project.yaml
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- job:
name: zuul-jobs-test-hlint
Expand All @@ -43,8 +43,8 @@
- test-playbooks/haskell/setup-project.yaml
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- project:
check:
Expand Down
12 changes: 6 additions & 6 deletions zuul-tests.d/packer-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@
label: debian-stretch

- job:
name: zuul-jobs-test-packer-fedora-31
description: Test packer job on fedora-31
name: zuul-jobs-test-packer-fedora-32
description: Test packer job on fedora-32
parent: zuul-jobs-test-packer
tags: auto-generated
nodeset:
nodes:
- name: fedora-31
label: fedora-31
- name: fedora-32
label: fedora-32

- job:
name: zuul-jobs-test-packer-gentoo-17-0-systemd
Expand Down Expand Up @@ -125,7 +125,7 @@
- zuul-jobs-test-packer-centos-7
- zuul-jobs-test-packer-centos-8
- zuul-jobs-test-packer-debian-stretch
- zuul-jobs-test-packer-fedora-31
- zuul-jobs-test-packer-fedora-32
- zuul-jobs-test-packer-gentoo-17-0-systemd
- zuul-jobs-test-packer-opensuse-15
- zuul-jobs-test-packer-opensuse-tumbleweed-nv
Expand All @@ -137,7 +137,7 @@
- zuul-jobs-test-packer-centos-7
- zuul-jobs-test-packer-centos-8
- zuul-jobs-test-packer-debian-stretch
- zuul-jobs-test-packer-fedora-31
- zuul-jobs-test-packer-fedora-32
- zuul-jobs-test-packer-gentoo-17-0-systemd
- zuul-jobs-test-packer-opensuse-15
- zuul-jobs-test-packer-ubuntu-bionic
Expand Down
Loading

0 comments on commit c5c9f7d

Please sign in to comment.