diff options
author | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-03-06 10:22:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-06 10:22:12 -0500 |
commit | 76cff7734233ff701e40e6c7b21491e0bed4a06d (patch) | |
tree | 2b99e930b57286e52f63b97108cfd58aab5e7f6f /tests | |
parent | d31707e6a400f2dfa4dca93b16e562e2c3f4a3db (diff) |
Fixed dependency names for Arch Linux. (#8334)
* Fix package names for Archlinux.
* Use a specific implementation of netcat on Arch.
* Use install-required-pacakges.sh from local branch instead of master.
* Use local copy of kickstart.sh instead of downloading it.
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/updater_checks.bats | 5 | ||||
-rwxr-xr-x | tests/updater_checks.sh | 19 |
2 files changed, 4 insertions, 20 deletions
diff --git a/tests/updater_checks.bats b/tests/updater_checks.bats index 1a7eeb704e..6444c081cc 100755 --- a/tests/updater_checks.bats +++ b/tests/updater_checks.bats @@ -35,10 +35,7 @@ setup() { } @test "install stable netdata using kickstart" { - kickstart_file="/tmp/kickstart.$$" - curl -Ss -o ${kickstart_file} https://my-netdata.io/kickstart.sh - chmod +x ${kickstart_file} - ${kickstart_file} --dont-wait --dont-start-it --auto-update --install ${INSTALLATION} + ./packaging/installer/kickstart.sh --dont-wait --dont-start-it --auto-update --install ${INSTALLATION} # Validate particular files for file in $FILES; do diff --git a/tests/updater_checks.sh b/tests/updater_checks.sh index 826495bc3d..2e9bf8eb4f 100755 --- a/tests/updater_checks.sh +++ b/tests/updater_checks.sh @@ -25,9 +25,7 @@ blind_arch_grep_install() { } blind_arch_grep_install || echo "Workaround failed, proceed as usual" -running_os="$(cat /etc/os-release |grep '^ID=' | cut -d'=' -f2 | sed -e 's/"//g')" -# Special case for older centos -[[ -f /etc/centos-release ]] && [[ -z "${running_os}" ]] && running_os="$(cat /etc/centos-release | grep "CentOS release 6" | cut -d' ' -f 1)" +running_os="$(grep '^ID=' /etc/os-release | cut -d'=' -f2 | sed -e 's/"//g')" case "${running_os}" in "centos"|"fedora"|"CentOS") @@ -65,20 +63,9 @@ case "${running_os}" in ;; esac -# Download and run depednency scriptlet, before anything else +# Run depednency scriptlet, before anything else # -deps_tool="/tmp/deps_tool.$$.sh" -curl -Ss -o ${deps_tool} https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/install-required-packages.sh -if [ -f "${deps_tool}" ]; then - echo "Running dependency handling script.." - chmod +x "${deps_tool}" - ${deps_tool} --non-interactive netdata - rm -f "${deps_tool}" - echo "Done!" -else - echo "Failed to fetch dependency script, aborting the test" - exit 1 -fi +./packaging/installer/install-required-packages.sh --non-interactive netdata echo "Running BATS file.." bats --tap tests/updater_checks.bats |