Merging upstream version 1.30.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 30 insertions, 5 deletions

diff --git a/packaging/scripts/install.sh b/packaging/scripts/install.sh
index db8d4a67f..c591b0bee 100755
--- a/packaging/scripts/install.sh
+++ b/packaging/scripts/install.sh
@@ -7,7 +7,7 @@ install_debian_like() {
   apt-get update
 
   # Install NetData
-  apt-get install -y "/artifacts/netdata_${VERSION}_${ARCH}.deb"
+  apt-get install -y "/packages/netdata_${VERSION}_${ARCH}.deb"
 
   # Install testing tools
   apt-get install -y --no-install-recommends \
@@ -20,8 +20,28 @@ install_fedora_like() {
 
   PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")"
 
+  pkg_version="$(echo "${VERSION}" | tr - .)"
+
   # Install NetData
-  "$PKGMGR" install -y /artifacts/netdata-"${VERSION}"-*.rpm
+  "$PKGMGR" install -y /packages/netdata-"${pkg_version}"-*.rpm
+
+  # Install testing tools
+  "$PKGMGR" install -y curl nc jq
+}
+
+install_centos() {
+  # Using a glob pattern here because I can't reliably determine what the
+  # resulting package name will be (TODO: There must be a better way!)
+
+  PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")"
+
+  pkg_version="$(echo "${VERSION}" | tr - .)"
+
+  # Install EPEL (needed for `jq`
+  "$PKGMGR" install -y epel-release
+
+  # Install NetData
+  "$PKGMGR" install -y /packages/netdata-"${pkg_version}"-*.rpm
 
   # Install testing tools
   "$PKGMGR" install -y curl nc jq
@@ -31,23 +51,28 @@ install_suse_like() {
   # Using a glob pattern here because I can't reliably determine what the
   # resulting package name will be (TODO: There must be a better way!)
 
+  pkg_version="$(echo "${VERSION}" | tr - .)"
+
   # Install NetData
   # FIXME: Allow unsigned packages (for now) #7773
   zypper install -y --allow-unsigned-rpm \
-    /artifacts/netdata-"${VERSION}"-*.rpm
+    /packages/netdata-"${pkg_version}"-*.rpm
 
   # Install testing tools
   zypper install -y --no-recommends \
-    curl netcat jq
+    curl gnu-netcat jq
 }
 
 case "${DISTRO}" in
   debian | ubuntu)
     install_debian_like
     ;;
-  fedora | centos)
+  fedora)
     install_fedora_like
     ;;
+  centos)
+    install_centos
+    ;;
   opensuse)
     install_suse_like
     ;;