From 483926a283e118590da3f9ecfa75a8a4d62143ce Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 1 Dec 2021 07:15:11 +0100
Subject: Merging upstream version 1.32.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 packaging/scripts/install.sh | 83 --------------------------------------------
 packaging/scripts/test.sh    | 52 ---------------------------
 2 files changed, 135 deletions(-)
 delete mode 100755 packaging/scripts/install.sh
 delete mode 100755 packaging/scripts/test.sh

(limited to 'packaging/scripts')

diff --git a/packaging/scripts/install.sh b/packaging/scripts/install.sh
deleted file mode 100755
index b14ca11e5..000000000
--- a/packaging/scripts/install.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-
-install_debian_like() {
-  # This is needed to ensure package installs don't prompt for any user input.
-  export DEBIAN_FRONTEND=noninteractive
-
-  apt-get update
-
-  # Install NetData
-  apt-get install -y "/packages/netdata_${VERSION}_${ARCH}.deb"
-
-  # Install testing tools
-  apt-get install -y --no-install-recommends \
-    curl netcat jq
-}
-
-install_fedora_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!)
-
-  PKGMGR="$( (command -v dnf > /dev/null && echo "dnf") || echo "yum")"
-
-  pkg_version="$(echo "${VERSION}" | tr - .)"
-
-  # Install NetData
-  "$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
-}
-
-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 \
-    /packages/netdata-"${pkg_version}"-*.rpm
-
-  # Install testing tools
-  zypper install -y --no-recommends \
-    curl gnu-netcat jq
-}
-
-case "${DISTRO}" in
-  debian | ubuntu)
-    install_debian_like
-    ;;
-  fedora)
-    install_fedora_like
-    ;;
-  centos)
-    install_centos
-    ;;
-  opensuse)
-    install_suse_like
-    ;;
-  *)
-    printf "ERROR: unsupported distro: %s_%s\n" "${DISTRO}" "${DISTRO_VERSION}"
-    exit 1
-    ;;
-esac
diff --git a/packaging/scripts/test.sh b/packaging/scripts/test.sh
deleted file mode 100755
index c39082622..000000000
--- a/packaging/scripts/test.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/sh
-
-dump_log() {
-  cat ./netdata.log
-}
-
-trap dump_log EXIT
-
-wait_for() {
-  host="${1}"
-  port="${2}"
-  name="${3}"
-  timeout="30"
-
-  if command -v nc > /dev/null ; then
-    netcat="nc"
-  elif command -v netcat > /dev/null ; then
-    netcat="netcat"
-  else
-    printf "Unable to find a usable netcat command.\n"
-    return 1
-  fi
-
-  printf "Waiting for %s on %s:%s ... " "${name}" "${host}" "${port}"
-
-  sleep 30
-
-  i=0
-  while ! ${netcat} -z "${host}" "${port}"; do
-    sleep 1
-    if [ "$i" -gt "$timeout" ]; then
-      printf "Timed out!\n"
-      return 1
-    fi
-    i="$((i + 1))"
-  done
-  printf "OK\n"
-}
-
-/usr/sbin/netdata -D > ./netdata.log 2>&1 &
-
-wait_for localhost 19999 netdata || exit 1
-
-curl -sS http://127.0.0.1:19999/api/v1/info > ./response || exit 1
-
-cat ./response
-
-jq '.version' ./response || exit 1
-
-trap - EXIT
-
-cp -a /packages/* /artifacts
-- 
cgit v1.2.3