openstack/openstack-zuul-jobs
Code Issues Proposed changes

Remove centos-8

Browse Source 
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
This commit is contained in:
Clark Boylan 2022-01-11 13:01:24 -08:00
parent 1bc98d2ee8
commit eaa4324e6d
4 changed files with 25 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
playbooks/openafs-rpm-package-build/publish.yaml
View File

@ -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

11
roles/openafs-rpm-package-build/tasks/main.yaml
View File

@ -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

34
zuul.d/jobs.yaml
View File

@ -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

16
zuul.d/project.yaml
View File

@ -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: