diff --git a/roles/configure-mirrors/tasks/mirror/CentOS-8-stream.yaml b/roles/configure-mirrors/tasks/mirror/CentOS-8-stream.yaml new file mode 100644 index 000000000..b407fbe47 --- /dev/null +++ b/roles/configure-mirrors/tasks/mirror/CentOS-8-stream.yaml @@ -0,0 +1,30 @@ +- name: Install CentOS 8 Stream repository files + become: yes + template: + dest: "/{{ zj_repo }}" + group: root + mode: 0644 + owner: root + src: "centos8-stream/{{ zj_repo }}.j2" + with_items: + - etc/yum.repos.d/CentOS-Stream-AppStream.repo + - etc/yum.repos.d/CentOS-Stream-Base.repo + - etc/yum.repos.d/CentOS-Stream-HA.repo + - etc/yum.repos.d/CentOS-Stream-Extras.repo + - etc/yum.repos.d/CentOS-Stream-PowerTools.repo + loop_control: + loop_var: zj_repo + notify: + - Update yum/dnf cache + +# http://dnf.readthedocs.io/en/latest/conf_ref.html#options-for-both-main-and-repo +# deltarpm is useful when the bottleneck is the network throughput. +# It also requires additional drpm packages to be hosted by the mirrors which +# is not done by default. +- name: Disable deltrarpm + become: yes + ini_file: + path: /etc/dnf.conf + section: main + option: deltarpm + value: 0 diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2 new file mode 100644 index 000000000..a09791768 --- /dev/null +++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-AppStream.repo.j2 @@ -0,0 +1,7 @@ +# {{ ansible_managed }} +[AppStream] +name=CentOS-Stream - AppStream +baseurl={{ package_mirror }}/$stream/AppStream/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Base.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Base.repo.j2 new file mode 100644 index 000000000..bbb1a3a9c --- /dev/null +++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Base.repo.j2 @@ -0,0 +1,7 @@ +# {{ ansible_managed }} +[BaseOS] +name=CentOS-Stream - Base +baseurl={{ package_mirror }}/$stream/BaseOS/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Extras.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Extras.repo.j2 new file mode 100644 index 000000000..682217fd0 --- /dev/null +++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-Extras.repo.j2 @@ -0,0 +1,7 @@ +# {{ ansible_managed }} +[extras] +name=CentOS-Stream - Extras +baseurl={{ package_mirror }}/$stream/extras/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HA.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HA.repo.j2 new file mode 100644 index 000000000..9b9dd92e1 --- /dev/null +++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-HA.repo.j2 @@ -0,0 +1,7 @@ +# {{ ansible_managed }} +[HighAvailability] +name=CentOS-Stream - HA +baseurl={{ package_mirror }}/$stream/HighAvailability/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2 b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2 new file mode 100644 index 000000000..dc7501ec4 --- /dev/null +++ b/roles/configure-mirrors/templates/centos8-stream/etc/yum.repos.d/CentOS-Stream-PowerTools.repo.j2 @@ -0,0 +1,7 @@ +# {{ ansible_managed }} +[PowerTools] +name=CentOS-Stream - PowerTools +baseurl={{ package_mirror }}/$stream/PowerTools/$basearch/os/ +gpgcheck=1 +enabled=1 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial diff --git a/tools/update-test-platforms.py b/tools/update-test-platforms.py index b881b3783..15fe913b1 100755 --- a/tools/update-test-platforms.py +++ b/tools/update-test-platforms.py @@ -31,6 +31,7 @@ import ruamellib PLATFORMS = [ 'centos-7', 'centos-8', + 'centos-8-stream', 'debian-stretch', 'fedora-32', 'gentoo-17-0-systemd', diff --git a/zuul-tests.d/general-roles-jobs.yaml b/zuul-tests.d/general-roles-jobs.yaml index 2c1c5a8b9..223575615 100644 --- a/zuul-tests.d/general-roles-jobs.yaml +++ b/zuul-tests.d/general-roles-jobs.yaml @@ -144,6 +144,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-base-roles-centos-8-stream + description: Tests roles in the 'base' job on centos-8-stream + parent: zuul-jobs-test-base-roles + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-base-roles-debian-stretch description: Tests roles in the 'base' job on debian-stretch @@ -259,6 +269,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-bindep-centos-8-stream + description: Test the bindep role on centos-8-stream + parent: zuul-jobs-test-bindep + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-bindep-debian-stretch description: Test the bindep role on debian-stretch @@ -435,6 +455,25 @@ nodes: - secondary +- job: + name: zuul-jobs-test-multinode-roles-centos-8-stream + description: Tests multinode setup roles on centos-8-stream + parent: zuul-jobs-test-multinode-roles + tags: auto-generated + nodeset: + nodes: + - name: primary + label: centos-8-stream + - name: secondary + label: centos-8-stream + groups: + - name: switch + nodes: + - primary + - name: peers + nodes: + - secondary + - job: name: zuul-jobs-test-multinode-roles-debian-stretch description: Tests multinode setup roles on debian-stretch @@ -663,6 +702,7 @@ - zuul-jobs-test-add-sshkey - zuul-jobs-test-base-roles-centos-7 - zuul-jobs-test-base-roles-centos-8 + - zuul-jobs-test-base-roles-centos-8-stream - zuul-jobs-test-base-roles-debian-stretch - zuul-jobs-test-base-roles-fedora-32 - zuul-jobs-test-base-roles-gentoo-17-0-systemd @@ -673,6 +713,7 @@ - zuul-jobs-test-base-roles-ubuntu-focal - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 + - zuul-jobs-test-bindep-centos-8-stream - zuul-jobs-test-bindep-debian-stretch - zuul-jobs-test-bindep-fedora-32 - zuul-jobs-test-bindep-gentoo-17-0-systemd @@ -687,6 +728,7 @@ - zuul-jobs-test-dstat-graph - zuul-jobs-test-multinode-roles-centos-7 - zuul-jobs-test-multinode-roles-centos-8 + - zuul-jobs-test-multinode-roles-centos-8-stream - zuul-jobs-test-multinode-roles-debian-stretch - zuul-jobs-test-multinode-roles-fedora-32 - zuul-jobs-test-multinode-roles-gentoo-17-0-systemd-nv @@ -708,6 +750,7 @@ - zuul-jobs-test-add-sshkey - zuul-jobs-test-base-roles-centos-7 - zuul-jobs-test-base-roles-centos-8 + - zuul-jobs-test-base-roles-centos-8-stream - zuul-jobs-test-base-roles-debian-stretch - zuul-jobs-test-base-roles-fedora-32 - zuul-jobs-test-base-roles-gentoo-17-0-systemd @@ -717,6 +760,7 @@ - zuul-jobs-test-base-roles-ubuntu-focal - zuul-jobs-test-bindep-centos-7 - zuul-jobs-test-bindep-centos-8 + - zuul-jobs-test-bindep-centos-8-stream - zuul-jobs-test-bindep-debian-stretch - zuul-jobs-test-bindep-fedora-32 - zuul-jobs-test-bindep-gentoo-17-0-systemd @@ -730,6 +774,7 @@ - zuul-jobs-test-dstat-graph - zuul-jobs-test-multinode-roles-centos-7 - zuul-jobs-test-multinode-roles-centos-8 + - zuul-jobs-test-multinode-roles-centos-8-stream - zuul-jobs-test-multinode-roles-debian-stretch - zuul-jobs-test-multinode-roles-fedora-32 - zuul-jobs-test-multinode-roles-opensuse-15 diff --git a/zuul-tests.d/go-jobs.yaml b/zuul-tests.d/go-jobs.yaml index 8f65029e6..df24728e3 100644 --- a/zuul-tests.d/go-jobs.yaml +++ b/zuul-tests.d/go-jobs.yaml @@ -36,6 +36,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-golang-go-centos-8-stream + description: Test the golang-go job on centos-8-stream + parent: zuul-jobs-test-golang-go + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-golang-go-debian-stretch description: Test the golang-go job on debian-stretch @@ -122,6 +132,7 @@ jobs: - zuul-jobs-test-golang-go-centos-7 - zuul-jobs-test-golang-go-centos-8 + - zuul-jobs-test-golang-go-centos-8-stream - zuul-jobs-test-golang-go-debian-stretch - zuul-jobs-test-golang-go-fedora-32 - zuul-jobs-test-golang-go-gentoo-17-0-systemd @@ -134,6 +145,7 @@ jobs: &id001 - zuul-jobs-test-golang-go-centos-7 - zuul-jobs-test-golang-go-centos-8 + - zuul-jobs-test-golang-go-centos-8-stream - zuul-jobs-test-golang-go-debian-stretch - zuul-jobs-test-golang-go-fedora-32 - zuul-jobs-test-golang-go-gentoo-17-0-systemd diff --git a/zuul-tests.d/packer-jobs.yaml b/zuul-tests.d/packer-jobs.yaml index 40ca36cee..227a37393 100644 --- a/zuul-tests.d/packer-jobs.yaml +++ b/zuul-tests.d/packer-jobs.yaml @@ -38,6 +38,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-packer-centos-8-stream + description: Test packer job on centos-8-stream + parent: zuul-jobs-test-packer + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-packer-debian-stretch description: Test packer job on debian-stretch @@ -124,6 +134,7 @@ jobs: - zuul-jobs-test-packer-centos-7 - zuul-jobs-test-packer-centos-8 + - zuul-jobs-test-packer-centos-8-stream - zuul-jobs-test-packer-debian-stretch - zuul-jobs-test-packer-fedora-32 - zuul-jobs-test-packer-gentoo-17-0-systemd @@ -136,6 +147,7 @@ jobs: &id001 - zuul-jobs-test-packer-centos-7 - zuul-jobs-test-packer-centos-8 + - zuul-jobs-test-packer-centos-8-stream - zuul-jobs-test-packer-debian-stretch - zuul-jobs-test-packer-fedora-32 - zuul-jobs-test-packer-gentoo-17-0-systemd diff --git a/zuul-tests.d/python-jobs.yaml b/zuul-tests.d/python-jobs.yaml index 889317968..1aaa18cbc 100644 --- a/zuul-tests.d/python-jobs.yaml +++ b/zuul-tests.d/python-jobs.yaml @@ -30,6 +30,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-ensure-pip-centos-8-stream + description: Test the ensure-pip role on centos-8-stream + parent: zuul-jobs-test-ensure-pip + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-ensure-pip-debian-stretch description: Test the ensure-pip role on debian-stretch @@ -149,6 +159,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-ensure-tox-centos-8-stream + description: Test the ensure-tox role on centos-8-stream + parent: zuul-jobs-test-ensure-tox + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-ensure-tox-debian-stretch description: Test the ensure-tox role on debian-stretch @@ -262,6 +282,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream + description: Test the fetch-sphinx-tarball role on centos-8-stream + parent: zuul-jobs-test-fetch-sphinx-tarball + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-fetch-sphinx-tarball-debian-stretch description: Test the fetch-sphinx-tarball role on debian-stretch @@ -453,6 +483,7 @@ jobs: - zuul-jobs-test-ensure-pip-centos-7 - zuul-jobs-test-ensure-pip-centos-8 + - zuul-jobs-test-ensure-pip-centos-8-stream - zuul-jobs-test-ensure-pip-debian-stretch - zuul-jobs-test-ensure-pip-fedora-32 - zuul-jobs-test-ensure-pip-gentoo-17-0-systemd @@ -464,6 +495,7 @@ - zuul-jobs-test-ensure-sphinx - zuul-jobs-test-ensure-tox-centos-7 - zuul-jobs-test-ensure-tox-centos-8 + - zuul-jobs-test-ensure-tox-centos-8-stream - zuul-jobs-test-ensure-tox-debian-stretch - zuul-jobs-test-ensure-tox-fedora-32 - zuul-jobs-test-ensure-tox-gentoo-17-0-systemd @@ -474,6 +506,7 @@ - zuul-jobs-test-ensure-tox-ubuntu-focal - zuul-jobs-test-fetch-sphinx-tarball-centos-7 - zuul-jobs-test-fetch-sphinx-tarball-centos-8 + - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch - zuul-jobs-test-fetch-sphinx-tarball-fedora-32 - zuul-jobs-test-fetch-sphinx-tarball-gentoo-17-0-systemd @@ -494,6 +527,7 @@ jobs: &id001 - zuul-jobs-test-ensure-pip-centos-7 - zuul-jobs-test-ensure-pip-centos-8 + - zuul-jobs-test-ensure-pip-centos-8-stream - zuul-jobs-test-ensure-pip-debian-stretch - zuul-jobs-test-ensure-pip-fedora-32 - zuul-jobs-test-ensure-pip-gentoo-17-0-systemd @@ -504,6 +538,7 @@ - zuul-jobs-test-ensure-sphinx - zuul-jobs-test-ensure-tox-centos-7 - zuul-jobs-test-ensure-tox-centos-8 + - zuul-jobs-test-ensure-tox-centos-8-stream - zuul-jobs-test-ensure-tox-debian-stretch - zuul-jobs-test-ensure-tox-fedora-32 - zuul-jobs-test-ensure-tox-gentoo-17-0-systemd @@ -513,6 +548,7 @@ - zuul-jobs-test-ensure-tox-ubuntu-focal - zuul-jobs-test-fetch-sphinx-tarball-centos-7 - zuul-jobs-test-fetch-sphinx-tarball-centos-8 + - zuul-jobs-test-fetch-sphinx-tarball-centos-8-stream - zuul-jobs-test-fetch-sphinx-tarball-debian-stretch - zuul-jobs-test-fetch-sphinx-tarball-fedora-32 - zuul-jobs-test-fetch-sphinx-tarball-gentoo-17-0-systemd diff --git a/zuul-tests.d/python-roles-jobs.yaml b/zuul-tests.d/python-roles-jobs.yaml index d3097aeac..a68ee757f 100644 --- a/zuul-tests.d/python-roles-jobs.yaml +++ b/zuul-tests.d/python-roles-jobs.yaml @@ -32,6 +32,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-build-python-release-jobs-centos-8-stream + description: Test the build-python-release-jobs role on centos-8-stream + parent: zuul-jobs-test-build-python-release-jobs + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-build-python-release-jobs-debian-stretch description: Test the build-python-release-jobs role on debian-stretch @@ -142,6 +152,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-ensure-python-pyenv-centos-8-stream + description: Test the ensure-python role with pyenv on centos-8-stream + parent: zuul-jobs-test-ensure-python-pyenv + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-ensure-python-pyenv-debian-stretch description: Test the ensure-python role with pyenv on debian-stretch @@ -228,6 +248,7 @@ jobs: - zuul-jobs-test-build-python-release-jobs-centos-7 - zuul-jobs-test-build-python-release-jobs-centos-8 + - zuul-jobs-test-build-python-release-jobs-centos-8-stream - zuul-jobs-test-build-python-release-jobs-debian-stretch - zuul-jobs-test-build-python-release-jobs-fedora-32 - zuul-jobs-test-build-python-release-jobs-gentoo-17-0-systemd @@ -238,6 +259,7 @@ - zuul-jobs-test-build-python-release-jobs-ubuntu-focal - zuul-jobs-test-ensure-python-pyenv-centos-7 - zuul-jobs-test-ensure-python-pyenv-centos-8 + - zuul-jobs-test-ensure-python-pyenv-centos-8-stream - zuul-jobs-test-ensure-python-pyenv-debian-stretch - zuul-jobs-test-ensure-python-pyenv-fedora-32 - zuul-jobs-test-ensure-python-pyenv-gentoo-17-0-systemd @@ -250,6 +272,7 @@ jobs: &id001 - zuul-jobs-test-build-python-release-jobs-centos-7 - zuul-jobs-test-build-python-release-jobs-centos-8 + - zuul-jobs-test-build-python-release-jobs-centos-8-stream - zuul-jobs-test-build-python-release-jobs-debian-stretch - zuul-jobs-test-build-python-release-jobs-fedora-32 - zuul-jobs-test-build-python-release-jobs-gentoo-17-0-systemd @@ -259,6 +282,7 @@ - zuul-jobs-test-build-python-release-jobs-ubuntu-focal - zuul-jobs-test-ensure-python-pyenv-centos-7 - zuul-jobs-test-ensure-python-pyenv-centos-8 + - zuul-jobs-test-ensure-python-pyenv-centos-8-stream - zuul-jobs-test-ensure-python-pyenv-debian-stretch - zuul-jobs-test-ensure-python-pyenv-fedora-32 - zuul-jobs-test-ensure-python-pyenv-gentoo-17-0-systemd diff --git a/zuul-tests.d/rust-jobs.yaml b/zuul-tests.d/rust-jobs.yaml index 4c9ec6b38..4812a73a4 100644 --- a/zuul-tests.d/rust-jobs.yaml +++ b/zuul-tests.d/rust-jobs.yaml @@ -33,6 +33,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-rust-centos-8-stream + description: Test the rust roles on centos-8-stream + parent: zuul-jobs-test-rust + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-rust-debian-stretch description: Test the rust roles on debian-stretch @@ -119,6 +129,7 @@ jobs: - zuul-jobs-test-rust-centos-7 - zuul-jobs-test-rust-centos-8 + - zuul-jobs-test-rust-centos-8-stream - zuul-jobs-test-rust-debian-stretch - zuul-jobs-test-rust-fedora-32 - zuul-jobs-test-rust-gentoo-17-0-systemd @@ -131,6 +142,7 @@ jobs: &id001 - zuul-jobs-test-rust-centos-7 - zuul-jobs-test-rust-centos-8 + - zuul-jobs-test-rust-centos-8-stream - zuul-jobs-test-rust-debian-stretch - zuul-jobs-test-rust-fedora-32 - zuul-jobs-test-rust-gentoo-17-0-systemd diff --git a/zuul-tests.d/terraform-jobs-roles.yaml b/zuul-tests.d/terraform-jobs-roles.yaml index 7d50a1207..59b3b2c31 100644 --- a/zuul-tests.d/terraform-jobs-roles.yaml +++ b/zuul-tests.d/terraform-jobs-roles.yaml @@ -40,6 +40,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-terraform-centos-8-stream + description: Test terraform job on centos-8-stream + parent: zuul-jobs-test-terraform + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-terraform-debian-stretch description: Test terraform job on debian-stretch @@ -163,6 +173,16 @@ - name: centos-8 label: centos-8 +- job: + name: zuul-jobs-test-terraform-role-centos-8-stream + description: Test terraform roles on centos-8-stream + parent: zuul-jobs-test-terraform-role + tags: auto-generated + nodeset: + nodes: + - name: centos-8-stream + label: centos-8-stream + - job: name: zuul-jobs-test-terraform-role-debian-stretch description: Test terraform roles on debian-stretch @@ -249,6 +269,7 @@ jobs: &id002 - zuul-jobs-test-terraform-centos-7 - zuul-jobs-test-terraform-centos-8 + - zuul-jobs-test-terraform-centos-8-stream - zuul-jobs-test-terraform-debian-stretch - zuul-jobs-test-terraform-fedora-32 - zuul-jobs-test-terraform-gentoo-17-0-systemd @@ -258,6 +279,7 @@ - zuul-jobs-test-terraform-ubuntu-focal - zuul-jobs-test-terraform-role-centos-7 - zuul-jobs-test-terraform-role-centos-8 + - zuul-jobs-test-terraform-role-centos-8-stream - zuul-jobs-test-terraform-role-debian-stretch - zuul-jobs-test-terraform-role-fedora-32 - zuul-jobs-test-terraform-role-gentoo-17-0-systemd