diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-09 04:52:47 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-06-09 04:52:57 +0000 |
| commit | 00151562145df50cc65e9902d52d5fa77f89fe50 (patch) | |
| tree | 2737716802f6725a5074d606ec8fe5422c58a83c /.github/scripts/pkg-test.sh | |
| parent | Releasing debian version 1.34.1-1. (diff) | |
| download | netdata-00151562145df50cc65e9902d52d5fa77f89fe50.tar.xz netdata-00151562145df50cc65e9902d52d5fa77f89fe50.zip | |
Merging upstream version 1.35.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.github/scripts/pkg-test.sh')
| -rwxr-xr-x | .github/scripts/pkg-test.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh index 148ecd629..179c0c41e 100755 --- a/.github/scripts/pkg-test.sh +++ b/.github/scripts/pkg-test.sh @@ -7,7 +7,7 @@ install_debian_like() { apt-get update # Install Netdata - apt-get install -y /netdata/artifacts/netdata_"${VERSION}"_*.deb || exit 1 + apt-get install -y /netdata/artifacts/netdata_"${VERSION}"*_*.deb || exit 1 # Install testing tools apt-get install -y --no-install-recommends curl netcat jq || exit 1 @@ -36,6 +36,10 @@ install_centos() { pkg_version="$(echo "${VERSION}" | tr - .)" + if [ "${PKGMGR}" = "dnf" ]; then + opts="--allowerasing" + fi + # Install EPEL (needed for `jq` "$PKGMGR" install -y epel-release || exit 1 @@ -43,7 +47,7 @@ install_centos() { "$PKGMGR" install -y /netdata/artifacts/netdata-"${pkg_version}"-*.rpm # Install testing tools - "$PKGMGR" install -y curl nc jq || exit 1 + "$PKGMGR" install -y ${opts} curl nc jq || exit 1 } install_suse_like() { @@ -101,7 +105,7 @@ case "${DISTRO}" in fedora | oraclelinux) install_fedora_like ;; - centos | rockylinux) + centos | rockylinux | almalinux) install_centos ;; opensuse) |