From 517a443636daa1e8085cb4e5325524a54e8a8fd7 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Tue, 17 Oct 2023 11:30:23 +0200
Subject: Merging upstream version 1.43.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 .github/scripts/ci-support-pkgs.sh      |  3 ++-
 .github/scripts/get-static-cache-key.sh |  5 +++--
 .github/scripts/pkg-test.sh             | 20 +++++++++++---------
 3 files changed, 16 insertions(+), 12 deletions(-)

(limited to '.github/scripts')

diff --git a/.github/scripts/ci-support-pkgs.sh b/.github/scripts/ci-support-pkgs.sh
index 9ba11b68e..5cedbf3b9 100755
--- a/.github/scripts/ci-support-pkgs.sh
+++ b/.github/scripts/ci-support-pkgs.sh
@@ -9,7 +9,8 @@ set -e
 
 case "${ID}" in
     amzn|almalinux|centos|fedora)
-        dnf install -y procps-ng cronie cronie-anacron || yum install -y procps-ng cronie cronie-anacron
+        dnf install -y procps-ng cronie cronie-anacron || \
+        yum install -y procps-ng cronie cronie-anacron
         ;;
     arch)
         pacman -S --noconfirm cronie
diff --git a/.github/scripts/get-static-cache-key.sh b/.github/scripts/get-static-cache-key.sh
index 3b07088f4..5093b3327 100755
--- a/.github/scripts/get-static-cache-key.sh
+++ b/.github/scripts/get-static-cache-key.sh
@@ -2,13 +2,14 @@
 
 arch="${1}"
 platform="$(packaging/makeself/uname2platform.sh "${arch}")"
+builder_rev="v1"
 
-docker pull --platform "${platform}" netdata/static-builder
+docker pull --platform "${platform}" netdata/static-builder:${builder_rev}
 
 # shellcheck disable=SC2046
 cat $(find packaging/makeself/jobs -type f ! -regex '.*\(netdata\|-makeself\).*') > /tmp/static-cache-key-data
 
-docker run -it --rm --platform "${platform}" netdata/static-builder sh -c 'apk list -I 2>/dev/null' >> /tmp/static-cache-key-data
+docker run -it --rm --platform "${platform}" netdata/static-builder:${builder_rev} sh -c 'apk list -I 2>/dev/null' >> /tmp/static-cache-key-data
 
 h="$(sha256sum /tmp/static-cache-key-data | cut -f 1 -d ' ')"
 
diff --git a/.github/scripts/pkg-test.sh b/.github/scripts/pkg-test.sh
index 85e8b2e8d..35767bf2e 100755
--- a/.github/scripts/pkg-test.sh
+++ b/.github/scripts/pkg-test.sh
@@ -14,7 +14,9 @@ install_debian_like() {
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  apt-get install -y $(find /netdata/artifacts -type f -name 'netdata*.deb' ! -name '*dbgsym*' ! -name '*cups*' ! -name '*freeipmi*') || exit 3
+  # shellcheck disable=SC2046
+  apt-get install -y $(find /netdata/artifacts -type f -name 'netdata*.deb' \
+! -name '*dbgsym*' ! -name '*cups*' ! -name '*freeipmi*') || exit 3
 
   # Install testing tools
   apt-get install -y --no-install-recommends curl "${netcat}" jq || exit 1
@@ -32,10 +34,10 @@ install_fedora_like() {
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1
+  "${PKGMGR}" install -y /netdata/artifacts/netdata*.rpm || exit 1
 
   # Install testing tools
-  "$PKGMGR" install -y curl nc jq || exit 1
+  "${PKGMGR}" install -y curl nc jq || exit 1
 }
 
 install_centos() {
@@ -49,15 +51,15 @@ install_centos() {
   fi
 
   # Install EPEL (needed for `jq`
-  "$PKGMGR" install -y epel-release || exit 1
+  "${PKGMGR}" install -y epel-release || exit 1
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1
+  "${PKGMGR}" install -y /netdata/artifacts/netdata*.rpm || exit 1
 
   # Install testing tools
   # shellcheck disable=SC2086
-  "$PKGMGR" install -y ${opts} curl nc jq || exit 1
+  "${PKGMGR}" install -y ${opts} curl nc jq || exit 1
 }
 
 install_amazon_linux() {
@@ -69,11 +71,11 @@ install_amazon_linux() {
 
   # Install Netdata
   # Strange quoting is required here so that glob matching works.
-  "$PKGMGR" install -y /netdata/artifacts/netdata*.rpm || exit 1
+  "${PKGMGR}" install -y /netdata/artifacts/netdata*.rpm || exit 1
 
   # Install testing tools
   # shellcheck disable=SC2086
-  "$PKGMGR" install -y ${opts} curl nc jq || exit 1
+  "${PKGMGR}" install -y ${opts} curl nc jq || exit 1
 }
 
 install_suse_like() {
@@ -130,7 +132,7 @@ case "${DISTRO}" in
   fedora | oraclelinux)
     install_fedora_like
     ;;
-  centos | rockylinux | almalinux)
+  centos| centos-stream | rockylinux | almalinux)
     install_centos
     ;;
   amazonlinux)
-- 
cgit v1.2.3