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.
Austin S. Hemmelgarn committed
Mar 6, 2020 at 10:22 UTC
76cff7734233ff701e40e6c7b21491e0bed4a06d
3 files changed
+7
-20
packaging/installer/install-required-packages.sh
+3
@@ -752,6 +752,7 @@ declare -A pkg_netcat=(
752
['rhel']="nmap-ncat"
753
['suse']="netcat-openbsd"
754
['clearlinux']="sysadmin-basic"
755
+ ['arch']="gnu-netcat"
756
['default']="netcat"
757
758
# exceptions
@@ -948,6 +949,7 @@ declare -A pkg_lz4=(
949
['suse']="liblz4-devel"
950
['gentoo']="app-arch/lz4"
951
['clearlinux']="devpkg-lz4"
952
+ ['arch']="lz4"
953
['default']="lz4-devel"
954
)
955
@@ -967,6 +969,7 @@ declare -A pkg_openssl=(
969
['ubuntu']="libssl-dev"
970
['suse']="libopenssl-devel"
971
['clearlinux']="devpkg-openssl"
972
+ ['arch']="openssl"
973
['default']="openssl-devel"
974
)
975
tests/updater_checks.bats
+1
-4
@@ -35,10 +35,7 @@ setup() {
35
}
36
37
@test "install stable netdata using kickstart" {
38
- kickstart_file="/tmp/kickstart.$$"
39
- curl -Ss -o ${kickstart_file} https://my-netdata.io/kickstart.sh
40
- chmod +x ${kickstart_file}
41
- ${kickstart_file} --dont-wait --dont-start-it --auto-update --install ${INSTALLATION}
38
+ ./packaging/installer/kickstart.sh --dont-wait --dont-start-it --auto-update --install ${INSTALLATION}
39
40
# Validate particular files
41
for file in $FILES; do
tests/updater_checks.sh
+3
-16
@@ -25,9 +25,7 @@ blind_arch_grep_install() {
25
}
26
blind_arch_grep_install || echo "Workaround failed, proceed as usual"
27
28
-running_os="$(cat /etc/os-release |grep '^ID=' | cut -d'=' -f2 | sed -e 's/"//g')"
29
-# Special case for older centos
30
-[[ -f /etc/centos-release ]] && [[ -z "${running_os}" ]] && running_os="$(cat /etc/centos-release | grep "CentOS release 6" | cut -d' ' -f 1)"
28
+running_os="$(grep '^ID=' /etc/os-release | cut -d'=' -f2 | sed -e 's/"//g')"
29
30
case "${running_os}" in
31
"centos"|"fedora"|"CentOS")
@@ -65,20 +63,9 @@ case "${running_os}" in
63
;;
64
esac
65
68
-# Download and run depednency scriptlet, before anything else
66
+# Run depednency scriptlet, before anything else
67
#
70
-deps_tool="/tmp/deps_tool.$$.sh"
71
-curl -Ss -o ${deps_tool} https://raw.githubusercontent.com/netdata/netdata/master/packaging/installer/install-required-packages.sh
72
-if [ -f "${deps_tool}" ]; then
73
- echo "Running dependency handling script.."
74
- chmod +x "${deps_tool}"
75
- ${deps_tool} --non-interactive netdata
76
- rm -f "${deps_tool}"
77
- echo "Done!"
78
-else
79
- echo "Failed to fetch dependency script, aborting the test"
80
- exit 1
81
-fi
68
+./packaging/installer/install-required-packages.sh --non-interactive netdata
69
70
echo "Running BATS file.."
71
bats --tap tests/updater_checks.bats