Replace CentOS 8 with RockyLinux 8 in CI and package builds. (#11801)
* Switch to using Rocky Linux 8 for RHEL 8 package builds. * Switch to RockyLinux 8 for RHEL 8-equivalent CI tests. * Fix handling of Rocky Linux.
Austin S. Hemmelgarn committed
Feb 1, 2022 at 06:55 UTC
8d1aac7a15466fdc9f9b466ecd2f05be9ea5b822
5 files changed
+8
-8
.github/data/build-matrix.json
+2
-2
@@ -34,8 +34,8 @@
34
"artifact_key": "centos7"
35
},
36
{
37
- "distro": "centos:8",
38
- "artifact_key": "centos8",
37
+ "distro": "rockylinux/rockylinux:8",
38
+ "artifact_key": "rockylinux8",
39
"rmjsonc": "dnf remove -y json-c-devel"
40
},
41
{
.github/scripts/pkg-test.sh
+1
-1
@@ -101,7 +101,7 @@ case "${DISTRO}" in
101
fedora | oraclelinux)
102
install_fedora_like
103
;;
104
- centos)
104
+ centos | rockylinux)
105
install_centos
106
;;
107
opensuse)
.github/workflows/packaging.yml
+2
-2
@@ -52,8 +52,8 @@ jobs:
52
- {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm/v7, arch: armhf}
53
- {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/arm64/v8, arch: arm64}
54
- {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
55
- - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
56
- - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/arm64/v8, arch: arm64}
55
+ - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64}
56
+ - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/arm64/v8, arch: arm64}
57
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
58
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm/v7, arch: armhf}
59
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/arm64/v8, arch: arm64}
.github/workflows/repoconfig-packages.yml
+1
-1
@@ -23,7 +23,7 @@ jobs:
23
- {distro: ubuntu, version: "20.04", pkgclouddistro: ubuntu/focal, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
24
- {distro: ubuntu, version: "21.10", pkgclouddistro: ubuntu/impish, format: deb, base_image: ubuntu, platform: linux/amd64, arch: amd64}
25
- {distro: centos, version: "7", pkgclouddistro: el/7, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
26
- - {distro: centos, version: "8", pkgclouddistro: el/8, format: rpm, base_image: centos, platform: linux/amd64, arch: amd64}
26
+ - {distro: rockylinux, version: "8", pkgclouddistro: el/8, format: rpm, base_image: rockylinux/rockylinux, platform: linux/amd64, arch: amd64}
27
- {distro: fedora, version: "34", pkgclouddistro: fedora/34, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
28
- {distro: fedora, version: "35", pkgclouddistro: fedora/35, format: rpm, base_image: fedora, platform: linux/amd64, arch: amd64}
29
- {distro: opensuse, version: "15.3", pkgclouddistro: opensuse/15.3, format: rpm, base_image: opensuse/leap, platform: linux/amd64, arch: amd64}
packaging/installer/install-required-packages.sh
+2
-2
@@ -198,7 +198,7 @@ get_os_release() {
198
eval "$(grep -E "^(NAME|ID|ID_LIKE|VERSION|VERSION_ID)=" "${os_release_file}")"
199
for x in "${ID}" ${ID_LIKE}; do
200
case "${x,,}" in
201
- alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | ol | rhel | sabayon | sles | suse | ubuntu)
201
+ alpine | arch | centos | clear-linux-os | debian | fedora | gentoo | manjaro | opensuse-leap | ol | rhel | rocky | sabayon | sles | suse | ubuntu)
202
distribution="${x}"
203
version="${VERSION_ID}"
204
codename="${VERSION}"
@@ -419,7 +419,7 @@ detect_package_manager_from_distribution() {
419
fi
420
;;
421
422
- centos* | clearos*)
422
+ centos* | clearos* | rocky*)
423
package_installer=""
424
tree="centos"
425
[ -n "${dnf}" ] && package_installer="install_dnf"