diff options
author | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2017-01-25 12:07:08 +0100 |
---|---|---|
committer | Nicolas Dechesne <nicolas.dechesne@linaro.org> | 2017-01-25 12:35:23 +0100 |
commit | b7e3876bb33cdd55f645c2f55f5c9bb57d051eac (patch) | |
tree | d864d552f426abed427b568c7f4288e37f9a9dd0 /automated/linux/nginx-apache-bench/apache-bench.sh | |
parent | 14c77d935aa059e9cad906f996885c163ed17f3f (diff) |
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 <nicolas.dechesne@linaro.org>
Diffstat (limited to 'automated/linux/nginx-apache-bench/apache-bench.sh')
-rwxr-xr-x | automated/linux/nginx-apache-bench/apache-bench.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/automated/linux/nginx-apache-bench/apache-bench.sh b/automated/linux/nginx-apache-bench/apache-bench.sh index f4c774c..88752e6 100755 --- a/automated/linux/nginx-apache-bench/apache-bench.sh +++ b/automated/linux/nginx-apache-bench/apache-bench.sh @@ -32,7 +32,7 @@ dist_name # systemctl available on Debian 8, CentOS 7 and newer releases. # shellcheck disable=SC2154 case "${dist}" in - Debian) + debian) pkgs="nginx apache2-utils" install_deps "${pkgs}" "${SKIP_INSTALL}" @@ -41,7 +41,7 @@ case "${dist}" in systemctl restart nginx ;; - CentOS) + centos) # x86_64 nginx package can be installed from epel repo. However, epel # project doesn't support ARM arch yet. RPB repo should provide nginx. [ "$(uname -m)" = "x86_64" ] && install_deps "epel-release" "${SKIP_INSTALL}" |