From b7e3876bb33cdd55f645c2f55f5c9bb57d051eac Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne Date: Wed, 25 Jan 2017 12:07:08 +0100 Subject: automated: switch to using ID field for distro Let's standardadize all test cases to use lowercase distro ID field from /etc/os-release, instead of the 'pretty' (capitalized) name that we used so far. This is an invasive change, all test scripts were modified with this command: $ sed -i -e 's|Debian\(.*\))|debian\1)|g' \ -e 's|Ubuntu\(.*\))|ubuntu\1)|g' \ -e 's|CentOS\(.*\))|centos\1)|g' \ -e 's|Fedora\(.*\))|fedora\1)|g' \ -e 's|Unknown\(.*\))|unknown\1)|g' And the remaining instances were fixed manually. dist_name() function was updated to always report lowercase distro name. Also when /etc/os-release is not available and that we use lsb_release output, we convert the old capitalized name into the new lowercase ones. Change-Id: I1f1ce0932ab04476567f0338e902656470267a74 Signed-off-by: Nicolas Dechesne --- automated/linux/smoke/smoke.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'automated/linux/smoke') diff --git a/automated/linux/smoke/smoke.sh b/automated/linux/smoke/smoke.sh index 32f71b0..96f68f9 100755 --- a/automated/linux/smoke/smoke.sh +++ b/automated/linux/smoke/smoke.sh @@ -22,9 +22,9 @@ install() { dist_name # shellcheck disable=SC2154 case "${dist}" in - Debian|Ubuntu) install_deps "lsb-release" "${SKIP_INSTALL}";; - Fedora|CentOS) install_deps "redhat-lsb-core" "${SKIP_INSTALL}";; - Unknown) warn_msg "Unsupported distro: package install skipped" ;; + debian|ubuntu) install_deps "lsb-release" "${SKIP_INSTALL}";; + fedora|centos) install_deps "redhat-lsb-core" "${SKIP_INSTALL}";; + unknown) warn_msg "Unsupported distro: package install skipped" ;; esac } -- cgit v1.2.3