From 3d776f6734ff0c5197471c7a89aa84511a0eff88 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 4 Aug 2021 12:05:36 +1000 Subject: [PATCH] Add CentOS 8 Stream wheel publish jobs Depends-On: https://review.opendev.org/c/openstack/openstack-zuul-jobs/+/802988 Change-Id: Id71888115597894d4dcb5c12731f819177fd9341 --- grafana/afs.yaml | 52 +++++++++++++++++++++++++++++ playbooks/publish/wheel-mirror.yaml | 12 ++++++- playbooks/wheel/release.yaml | 6 ++++ zuul.d/jobs.yaml | 28 ++++++++++++++++ zuul.d/projects.yaml | 4 +++ 5 files changed, 101 insertions(+), 1 deletion(-) diff --git a/grafana/afs.yaml b/grafana/afs.yaml index 07a51aee9f..d6b98a04f8 100644 --- a/grafana/afs.yaml +++ b/grafana/afs.yaml @@ -813,6 +813,23 @@ dashboard: refId: C hide: true + - title: Centos 8 Stream ARM64 + type: graph + span: 4 + yaxes: + - format: deckbytes + min: 0 + - format: deckbytes + min: 0 + targets: + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sa64.used, 'Used')" + refId: A + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sa64.quota, 'Quota')" + refId: B + - target: "divideSeries(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sa64.used, #B)" + refId: C + hide: true + - title: Bullseye ARM64 type: graph span: 4 @@ -937,6 +954,23 @@ dashboard: refId: C hide: true + - title: Centos 8 Stream x86_64 + type: graph + span: 4 + yaxes: + - format: deckbytes + min: 0 + - format: deckbytes + min: 0 + targets: + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sx64.used, 'Used')" + refId: A + - target: "alias(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sx64.quota, 'Quota')" + refId: B + - target: "divideSeries(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sx64.used, #B)" + refId: C + hide: true + - title: Bullseye x86_64 type: graph span: 4 @@ -1004,6 +1038,15 @@ dashboard: format: dateTimeFromNow valueFontSize: "50%" + - title: Centos 8 Stream ARM64 + type: singlestat + valueName: current + span: 2 + targets: + - target: "scale(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sa64_readonly.creation, 1000)" + format: dateTimeFromNow + valueFontSize: "50%" + - title: Bullseye ARM64 type: singlestat valueName: current @@ -1072,6 +1115,15 @@ dashboard: format: dateTimeFromNow valueFontSize: "50%" + - title: Centos 8 Stream x86_64 + type: singlestat + valueName: current + span: 2 + targets: + - target: "scale(stats.gauges.afs.afs01_dfw_openstack_org.vol.mirror_wheel_cent8sx64_readonly.creation, 1000)" + format: dateTimeFromNow + valueFontSize: "50%" + - title: Bullseye x86_64 type: singlestat valueName: current diff --git a/playbooks/publish/wheel-mirror.yaml b/playbooks/publish/wheel-mirror.yaml index adeba1d904..b12f371039 100644 --- a/playbooks/publish/wheel-mirror.yaml +++ b/playbooks/publish/wheel-mirror.yaml @@ -7,10 +7,20 @@ serial: 1 pre_tasks: + + # NOTE(ianw) 2021-08-04 : ansible_distribution currently reports + # both stream and non-stream as "CentOS" so we need to check lsb + # here. + - name: Generate AFS slug - CentOS Stream + set_fact: + afs_slug: 'centos-{{ ansible_distribution_major_version }}-stream-{{ ansible_architecture }}' + when: ansible_lsb.id == 'CentOSStream' + - name: Generate AFS slug - CentOS set_fact: afs_slug: "{{ ansible_distribution|lower }}-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}" - when: ansible_distribution == "CentOS" + when: ansible_distribution == "CentOS" and + ansible_lsb.id != 'CentOSStream' - name: Generate AFS slug - Debuntu set_fact: diff --git a/playbooks/wheel/release.yaml b/playbooks/wheel/release.yaml index 44bad76411..81affd0e9d 100644 --- a/playbooks/wheel/release.yaml +++ b/playbooks/wheel/release.yaml @@ -11,6 +11,12 @@ - role: release-afs-volume afs_volume: mirror.wheel.cent8a64 + # CentOS 8 Stream + - role: release-afs-volume + afs_volume: mirror.wheel.cent8sx64 + - role: release-afs-volume + afs_volume: mirror.wheel.cent8sa64 + # Debian - role: release-afs-volume afs_volume: mirror.wheel.busterx64 diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index e1337a32bf..e757d3fa8e 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -903,6 +903,34 @@ - name: afs secret: wheel_keytab +- job: + name: publish-wheel-cache-centos-8-stream + description: | + Publish CentOS Stream 8 wheels for OpenStack CI mirrors. + parent: build-wheel-cache-centos-8-stream + pre-run: playbooks/openafs-client/setup.yaml + post-run: playbooks/publish/wheel-mirror.yaml + allowed-projects: + - openstack/requirements + final: true + secrets: + - name: afs + secret: wheel_keytab + +- job: + name: publish-wheel-cache-centos-8-stream-arm64 + description: | + Publish CentOS Stream 8 wheels for OpenStack CI mirrors. + parent: build-wheel-cache-centos-8-stream-arm64 + pre-run: playbooks/openafs-client/setup.yaml + post-run: playbooks/publish/wheel-mirror.yaml + allowed-projects: + - openstack/requirements + final: true + secrets: + - name: afs + secret: wheel_keytab + - job: name: publish-wheel-cache-debian-bullseye description: | diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 6c78614ddf..94c41fa475 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -5157,12 +5157,14 @@ jobs: - publish-wheel-cache-centos-7 - publish-wheel-cache-centos-8 + - publish-wheel-cache-centos-8-stream - publish-wheel-cache-debian-bullseye - publish-wheel-cache-debian-buster - publish-wheel-cache-ubuntu-focal - publish-wheel-cache-ubuntu-bionic - publish-wheel-cache-ubuntu-xenial - publish-wheel-cache-centos-8-arm64 + - publish-wheel-cache-centos-8-stream-arm64 - publish-wheel-cache-debian-bullseye-arm64 - publish-wheel-cache-debian-buster-arm64 - publish-wheel-cache-ubuntu-focal-arm64 @@ -5171,12 +5173,14 @@ dependencies: - publish-wheel-cache-centos-7 - publish-wheel-cache-centos-8 + - publish-wheel-cache-centos-8-stream - publish-wheel-cache-debian-bullseye - publish-wheel-cache-debian-buster - publish-wheel-cache-ubuntu-focal - publish-wheel-cache-ubuntu-bionic - publish-wheel-cache-ubuntu-xenial - publish-wheel-cache-centos-8-arm64 + - publish-wheel-cache-centos-8-stream-arm64 - publish-wheel-cache-debian-bullseye-arm64 - publish-wheel-cache-debian-buster-arm64 - publish-wheel-cache-ubuntu-focal-arm64