diff options
| author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2023-03-29 07:56:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-29 07:56:27 -0400 |
| commit | 88809d369ac776803bd20f710de2561c31445af4 (patch) | |
| tree | 63a113b8341b1d34d272e3a4b6536580484ec5d0 /.github | |
| parent | e8ac84e4f2b75dd332e49b808b84bbdb81b9804b (diff) | |
Add Amazon Linux 2023 to CI, packaging, and platform support. (#14771)
* Add Amazon Linux 2023 to CI, packaging, and platform support.
* Fix dependencies for AL2023 in RPM spec file.
* Fix handling of package tests with DNF.
Diffstat (limited to '.github')
| -rw-r--r-- | .github/data/distros.yml | 11 | ||||
| -rwxr-xr-x | .github/scripts/pkg-test.sh | 8 |
2 files changed, 17 insertions, 2 deletions
diff --git a/.github/data/distros.yml b/.github/data/distros.yml index 376d5df043..b1663f13cb 100644 --- a/.github/data/distros.yml +++ b/.github/data/distros.yml @@ -74,10 +74,11 @@ include: - el/8Server - el/8Client - - distro: amazonlinux + - &amzn + distro: amazonlinux version: "2" eol_check: 'amazon-linux' - packages: + packages: &amzn_packages type: rpm repo_distro: amazonlinux/2 arches: @@ -85,6 +86,12 @@ include: - aarch64 test: ebpf-core: false + - <<: *amzn + version: "2023" + packages: + <<: *amzn_packages + repo_distro: amazonlinux/2023 + - distro: centos version: "7" diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh index 6e6e64f486..45b8c320b6 100755 --- a/.github/scripts/pkg-test.sh +++ b/.github/scripts/pkg-test.sh @@ -28,6 +28,10 @@ install_fedora_like() { pkg_version="$(echo "${VERSION}" | tr - .)" + if [ "${PKGMGR}" = "dnf" ]; then + opts="--allowerasing" + fi + # Install Netdata # Strange quoting is required here so that glob matching works. "$PKGMGR" install -y /netdata/artifacts/netdata-"${pkg_version}"-*.rpm || exit 1 @@ -65,6 +69,10 @@ install_amazon_linux() { pkg_version="$(echo "${VERSION}" | tr - .)" + if [ "${PKGMGR}" = "dnf" ]; then + opts="--allowerasing" + fi + # Install Netdata # Strange quoting is required here so that glob matching works. "$PKGMGR" install -y /netdata/artifacts/netdata-"${pkg_version}"-*.rpm || exit 1 |