From eaa4324e6dc99082da1b613ee3f325add96ae49a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 11 Jan 2022 13:01:24 -0800 Subject: [PATCH] Remove centos-8 This removes wheel build jobs for centos-8 (we already have them for -stream) and convers the openafs package builds over to centos-8-stream. This bumps the openafs version to try and accomodate the changes to the stream kernel on aarch64. Depends-On: https://review.opendev.org/c/openstack/project-config/+/824243 Depends-On: https://review.opendev.org/c/openstack/requirements/+/824258 Depends-On: https://review.opendev.org/c/openstack/requirements/+/824257 Depends-On: https://review.opendev.org/c/openstack/requirements/+/824256 Depends-On: https://review.opendev.org/c/openstack/requirements/+/824240 Change-Id: I7e196f6b3b2bf785b8a94bb04de7062da3042b34 --- .../openafs-rpm-package-build/publish.yaml | 16 +++++++-- .../openafs-rpm-package-build/tasks/main.yaml | 11 ++---- zuul.d/jobs.yaml | 34 +++---------------- zuul.d/project.yaml | 16 +++------ 4 files changed, 25 insertions(+), 52 deletions(-) diff --git a/playbooks/openafs-rpm-package-build/publish.yaml b/playbooks/openafs-rpm-package-build/publish.yaml index cb6c8867..3fe4d723 100644 --- a/playbooks/openafs-rpm-package-build/publish.yaml +++ b/playbooks/openafs-rpm-package-build/publish.yaml @@ -36,14 +36,20 @@ download_artifact_api: "https://zuul.opendev.org/api/tenant/{{ zuul.tenant }}" download_artifact_type: rpm.tar.gz download_artifact_pipeline: gate - download_artifact_job: openafs-rpm-package-build-centos-8-x86 + download_artifact_job: openafs-rpm-package-build-centos-8-stream-x86 download_artifact_directory: '{{ zuul.executor.work_root }}' - name: Extract centos 8 x86 unarchive: src: '{{ zuul.executor.work_root }}/openafs-rpms.tar.gz' + # Keep this old path for backward compat dest: '{{ zuul.executor.work_root }}/artifacts/openafs/centos8' + - name: Extract centos 8 x86 stream + unarchive: + src: '{{ zuul.executor.work_root }}/openafs-rpms.tar.gz' + dest: '{{ zuul.executor.work_root }}/artifacts/openafs/centos8-stream' + - name: Remove artifact file: state: absent @@ -56,14 +62,20 @@ download_artifact_api: "https://zuul.opendev.org/api/tenant/{{ zuul.tenant }}" download_artifact_type: rpm.tar.gz download_artifact_pipeline: gate - download_artifact_job: openafs-rpm-package-build-centos-8-arm64 + download_artifact_job: openafs-rpm-package-build-centos-8-stream-arm64 download_artifact_directory: '{{ zuul.executor.work_root }}' - name: Extract centos 8 arm64 unarchive: src: '{{ zuul.executor.work_root }}/openafs-rpms.tar.gz' + # Keep this old path for backward compat dest: '{{ zuul.executor.work_root }}/artifacts/openafs/centos8' + - name: Extract centos 8 arm64 stream + unarchive: + src: '{{ zuul.executor.work_root }}/openafs-rpms.tar.gz' + dest: '{{ zuul.executor.work_root }}/artifacts/openafs/centos8-stream' + - name: Remove artifact file: state: absent diff --git a/roles/openafs-rpm-package-build/tasks/main.yaml b/roles/openafs-rpm-package-build/tasks/main.yaml index 49aec417..17d94cb1 100644 --- a/roles/openafs-rpm-package-build/tasks/main.yaml +++ b/roles/openafs-rpm-package-build/tasks/main.yaml @@ -20,15 +20,10 @@ shell: | set -eux - VERSION=1.8.8pre1 + VERSION=1.8.8.1 - # NOTE(ianw) 2021-06-16 : we need a candidate release - # to deal with some changes pulled in by CentOS 8 kernel - URL_PATH=candidate/${VERSION} - SRPM=openafs-1.8.8-0.pre1.src.rpm - - # URL_PATH=${VERSION} - # SRPM=openafs-${VERSION}-1.src.rpm + URL_PATH=${VERSION} + SRPM=openafs-${VERSION}-1.src.rpm mkdir openafs wget https://www.openafs.org/dl/openafs/${URL_PATH}/openafs-${VERSION}-src.tar.bz2 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 2dcd04b9..2365f9f1 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -1332,14 +1332,14 @@ nodeset: centos-7 - job: - name: openafs-rpm-package-build-centos-8-x86 + name: openafs-rpm-package-build-centos-8-stream-x86 parent: openafs-rpm-package-build - nodeset: centos-8 + nodeset: centos-8-stream - job: - name: openafs-rpm-package-build-centos-8-arm64 + name: openafs-rpm-package-build-centos-8-stream-arm64 parent: openafs-rpm-package-build - nodeset: centos-8-arm64 + nodeset: centos-8-stream-arm64 - job: name: openafs-rpm-package-build-promote @@ -1487,32 +1487,6 @@ wheel-cache-centos-7-python2: wheel_python: python2 -- job: - name: build-wheel-cache-centos-8 - parent: build-wheel-cache-base - description: | - Build CentOS 8 wheels for OpenStack CI mirrors. - nodeset: - nodes: - - name: wheel-cache-centos-8-python3 - label: centos-8 - host-vars: - wheel-cache-centos-8-python3: - wheel_python: python3 - -- job: - name: build-wheel-cache-centos-8-arm64 - parent: build-wheel-cache-base - description: | - Build CentOS 8 wheels for OpenStack CI mirrors. - nodeset: - nodes: - - name: wheel-cache-centos-8-arm64-python3 - label: centos-8-arm64 - host-vars: - wheel-cache-centos-8-arm64-python3: - wheel_python: python3 - - job: name: build-wheel-cache-centos-8-stream parent: build-wheel-cache-base diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 02bf899b..3e3bc03b 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -6,8 +6,8 @@ check: jobs: - openafs-rpm-package-build-centos-7-x86 - - openafs-rpm-package-build-centos-8-x86 - - openafs-rpm-package-build-centos-8-arm64 + - openafs-rpm-package-build-centos-8-stream-x86 + - openafs-rpm-package-build-centos-8-stream-arm64 - openstack-infra-extra-integration-xenial - openstack-infra-extra-integration-bionic - openstack-zuul-jobs-linters @@ -15,10 +15,6 @@ files: - playbooks/wheel-cache - roles/build-wheel-cache - - build-wheel-cache-centos-8: - files: - - playbooks/wheel-cache - - roles/build-wheel-cache - build-wheel-cache-centos-8-stream: files: - playbooks/wheel-cache @@ -45,10 +41,6 @@ - roles/build-wheel-cache check-arm64: jobs: - - build-wheel-cache-centos-8-arm64: - files: - - playbooks/wheel-cache - - roles/build-wheel-cache - build-wheel-cache-centos-8-stream-arm64: files: - playbooks/wheel-cache @@ -72,8 +64,8 @@ gate: jobs: - openafs-rpm-package-build-centos-7-x86 - - openafs-rpm-package-build-centos-8-x86 - - openafs-rpm-package-build-centos-8-arm64 + - openafs-rpm-package-build-centos-8-stream-x86 + - openafs-rpm-package-build-centos-8-stream-arm64 - openstack-zuul-jobs-linters promote: jobs: