summaryrefslogtreecommitdiff
path: root/automated/linux
diff options
context:
space:
mode:
authorChase Qi <chase.qi@linaro.org>2017-06-16 18:17:17 +0800
committerMilosz Wasilewski <milosz.wasilewski@linaro.org>2017-06-21 16:20:39 +0000
commit0916f33ae552bdb68b907328919febdef1ff66a7 (patch)
tree81251effd6c618dc43c39cc4c81668455aa987e8 /automated/linux
parent01a53c6175663afc0ee8d73b63dd4284aaf6f8e3 (diff)
linux: jessie: install golang, nginx and openjdk8+ from backports
Fix https://bugs.linaro.org/show_bug.cgi?id=3044 Change-Id: I126ac676681440bfe55d7805d4206244f0200b7b Signed-off-by: Chase Qi <chase.qi@linaro.org>
Diffstat (limited to 'automated/linux')
-rwxr-xr-xautomated/linux/dsdbench/dsdbench.sh18
-rwxr-xr-xautomated/linux/lemp/lemp.sh10
-rwxr-xr-xautomated/linux/openjdk/openjdk-smoke.sh21
3 files changed, 38 insertions, 11 deletions
diff --git a/automated/linux/dsdbench/dsdbench.sh b/automated/linux/dsdbench/dsdbench.sh
index 155bc1d..f002db6 100755
--- a/automated/linux/dsdbench/dsdbench.sh
+++ b/automated/linux/dsdbench/dsdbench.sh
@@ -18,7 +18,7 @@ usage() {
while getopts "t:s:h" o; do
case "$o" in
t) TEST_SUITE="${OPTARG}" ;;
- s) SKIP_INSTALL="${OPTARG}" ;;
+ s) SKIP_INSTALL="${OPTARG}" && export SKIP_INSTALL ;;
h|*) usage ;;
esac
done
@@ -26,10 +26,20 @@ done
dist_name
# shellcheck disable=SC2154
case "${dist}" in
- debian|ubuntu) pkgs="git golang libdevmapper-dev" ;;
- fedora|centos) pkgs="git golang device-mapper-devel" ;;
+ debian|ubuntu)
+ dist_info
+ # shellcheck disable=SC2154
+ if [ "${Codename}" = "jessie" ]; then
+ install_deps "git libdevmapper-dev"
+ install_deps "-t jessie-backports golang"
+ else
+ install_deps "git golang libdevmapper-dev"
+ fi
+ ;;
+ fedora|centos)
+ install_deps "git golang device-mapper-devel"
+ ;;
esac
-install_deps "${pkgs}" "${SKIP_INSTALL}"
! check_root && error_msg "You need to be root to run this script."
create_out_dir "${OUTPUT}"
diff --git a/automated/linux/lemp/lemp.sh b/automated/linux/lemp/lemp.sh
index 11d9840..99f4b02 100755
--- a/automated/linux/lemp/lemp.sh
+++ b/automated/linux/lemp/lemp.sh
@@ -18,8 +18,14 @@ dist_name
# shellcheck disable=SC2154
case "${dist}" in
debian)
- pkgs="nginx mysql-server php5-mysql php5-fpm curl"
- install_deps "${pkgs}"
+ dist_info
+ # shellcheck disable=SC2154
+ if [ "${Codename}" = "jessie" ]; then
+ install_deps "mysql-server php5-mysql php5-fpm curl"
+ install_deps "-t jessie-backports nginx"
+ else
+ install_deps "nginx mysql-server php5-mysql php5-fpm curl"
+ fi
# Stop apache server in case it is installed and running.
systemctl stop apache2 > /dev/null 2>&1 || true
diff --git a/automated/linux/openjdk/openjdk-smoke.sh b/automated/linux/openjdk/openjdk-smoke.sh
index 3aa91ff..a31299d 100755
--- a/automated/linux/openjdk/openjdk-smoke.sh
+++ b/automated/linux/openjdk/openjdk-smoke.sh
@@ -1,5 +1,6 @@
#!/bin/sh
+# shellcheck disable=SC1091
. ../../lib/sh-test-lib
OUTPUT="$(pwd)/output"
RESULT_FILE="${OUTPUT}/result.txt"
@@ -28,12 +29,22 @@ else
dist_name
# shellcheck disable=SC2154
case "${dist}" in
- debian|ubuntu) pkg="openjdk-${VERSION}-jdk" ;;
- centos|fedora) pkg="java-1.${VERSION}.0-openjdk-devel" ;;
- *) error_msg "Unsupported distribution" ;;
+ debian|ubuntu)
+ dist_info
+ # shellcheck disable=SC2154
+ if [ "${Codename}" = "jessie" ] && [ "${VERSION}" -ge "8" ]; then
+ install_deps "-t jessie-backports openjdk-${VERSION}-jdk"
+ else
+ install_deps "openjdk-${VERSION}-jdk"
+ fi
+ ;;
+ centos|fedora)
+ install_deps "java-1.${VERSION}.0-openjdk-devel"
+ ;;
+ *)
+ error_msg "Unsupported distribution"
+ ;;
esac
- install_deps "${pkg}"
- exit_on_fail "jdk${VERSION}-installation"
fi
# Set the specific version as default in case more than one jdk installed.