From b42769b7ed6b22991dc928f699cdad1fcd2c806b Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Fri, 29 Apr 2022 15:13:14 +1000 Subject: [PATCH] Test openafs roles on CentOS 9-stream We have labeled the 8/9 stream repos with -stream for clarity; add this to the path for the repo. Change-Id: I5c4c5365d763f8a3c03a4adef36235e7809c44d7 Depends-On: https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/839689 --- roles/openafs-client/vars/CentOS.yaml | 2 +- zuul.d/system-config-roles.yaml | 28 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/roles/openafs-client/vars/CentOS.yaml b/roles/openafs-client/vars/CentOS.yaml index e6010567a3..fe22ce256b 100644 --- a/roles/openafs-client/vars/CentOS.yaml +++ b/roles/openafs-client/vars/CentOS.yaml @@ -1,3 +1,3 @@ openafs_client_config_path: '/usr/vice/etc' -openafs_client_yum_repo_url: https://tarballs.opendev.org/openstack/openstack-zuul-jobs/openafs/centos{{ ansible_distribution_major_version}}/RPMS/{{ ansible_architecture }} +openafs_client_yum_repo_url: https://tarballs.opendev.org/openstack/openstack-zuul-jobs/openafs/centos{{ ansible_distribution_major_version}}{{ (ansible_distribution_major_version | int >= 8) | ternary('-stream', '') }}/RPMS/{{ ansible_architecture }} openafs_client_yum_repo_gpg_check: no diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml index 73f4944680..2b9aa7b233 100644 --- a/zuul.d/system-config-roles.yaml +++ b/zuul.d/system-config-roles.yaml @@ -160,6 +160,30 @@ nodes: - base +- job: + name: system-config-zuul-role-integration-centos-9-stream + parent: system-config-zuul-role-integration + nodeset: + nodes: + - name: base + label: centos-9-stream + groups: + - name: openafs + nodes: + - base + +- job: + name: system-config-zuul-role-integration-centos-9-stream-arm64 + parent: system-config-zuul-role-integration + nodeset: + nodes: + - name: base + label: centos-9-stream-arm64 + groups: + - name: openafs + nodes: + - base + - project-template: name: system-config-zuul-role-integration check: @@ -175,6 +199,8 @@ - system-config-zuul-role-integration-debian-bullseye-arm64 - system-config-zuul-role-integration-centos-8-stream - system-config-zuul-role-integration-centos-8-stream-arm64 + - system-config-zuul-role-integration-centos-9-stream + - system-config-zuul-role-integration-centos-9-stream-arm64 gate: jobs: - system-config-zuul-role-integration-xenial @@ -188,3 +214,5 @@ - system-config-zuul-role-integration-debian-bullseye-arm64 - system-config-zuul-role-integration-centos-8-stream - system-config-zuul-role-integration-centos-8-stream-arm64 + - system-config-zuul-role-integration-centos-9-stream + - system-config-zuul-role-integration-centos-9-stream-arm64