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/openjdk/openjdk-smoke.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'automated/linux/openjdk/openjdk-smoke.sh') diff --git a/automated/linux/openjdk/openjdk-smoke.sh b/automated/linux/openjdk/openjdk-smoke.sh index 7202a85..29e9c28 100755 --- a/automated/linux/openjdk/openjdk-smoke.sh +++ b/automated/linux/openjdk/openjdk-smoke.sh @@ -27,8 +27,8 @@ if [ "${SKIP_INSTALL}" = "True" ] || [ "${SKIP_INSTALL}" = "true" ]; then else dist_name case "${dist}" in - Debian|Ubuntu) pkg="openjdk-${VERSION}-jdk" ;; - CentOS|Fedora) pkg="java-1.${VERSION}.0-openjdk-devel" ;; + debian|ubuntu) pkg="openjdk-${VERSION}-jdk" ;; + centos|fedora) pkg="java-1.${VERSION}.0-openjdk-devel" ;; *) error_msg "Unsupported distribution" ;; esac install_deps "${pkg}" -- cgit v1.2.3