diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-12-01 06:15:11 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2021-12-01 06:15:11 +0000 |
commit | 483926a283e118590da3f9ecfa75a8a4d62143ce (patch) | |
tree | cb77052778df9a128a8cd3ff5bf7645322a13bc5 /packaging/scripts | |
parent | Releasing debian version 1.31.0-4. (diff) | |
download | netdata-483926a283e118590da3f9ecfa75a8a4d62143ce.tar.xz netdata-483926a283e118590da3f9ecfa75a8a4d62143ce.zip |
Merging upstream version 1.32.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rwxr-xr-x | .github/scripts/docker-test.sh (renamed from packaging/scripts/test.sh) | 26 | ||||
-rwxr-xr-x | packaging/scripts/install.sh | 83 |
2 files changed, 16 insertions, 93 deletions
diff --git a/packaging/scripts/test.sh b/.github/scripts/docker-test.sh index c39082622..795711b1a 100755 --- a/packaging/scripts/test.sh +++ b/.github/scripts/docker-test.sh @@ -1,10 +1,6 @@ #!/bin/sh -dump_log() { - cat ./netdata.log -} - -trap dump_log EXIT +export DEBIAN_FRONTEND=noninteractive wait_for() { host="${1}" @@ -37,7 +33,21 @@ wait_for() { printf "OK\n" } -/usr/sbin/netdata -D > ./netdata.log 2>&1 & +apt-get update && apt-get upgrade -y && apt get install -y netcat + +docker run -d --name=netdata \ + -p 19999:19999 \ + -v netdataconfig:/etc/netdata \ + -v netdatalib:/var/lib/netdata \ + -v netdatacache:/var/cache/netdata \ + -v /etc/passwd:/host/etc/passwd:ro \ + -v /etc/group:/host/etc/group:ro \ + -v /proc:/host/proc:ro \ + -v /sys:/host/sys:ro \ + -v /etc/os-release:/host/etc/os-release:ro \ + --cap-add SYS_PTRACE \ + --security-opt apparmor=unconfined \ + netdata/netdata:test wait_for localhost 19999 netdata || exit 1 @@ -46,7 +56,3 @@ 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 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 |