diff options
author | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-03-07 14:41:03 +0200 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2018-03-19 11:56:50 +0000 |
commit | 4492fd3268e575dc79d77105821839631aac998f (patch) | |
tree | 9ae53512014752fd66f99b3cddf17bf9d24e30a9 /coin | |
parent | 5d7972b73b695e390b9bd3d82d7b6089b2ce84a2 (diff) |
Remove try_catch codes from Ubuntu 16.04 scripts
Change-Id: I4a377b8bc2a16d9b9c4123a9a4f623f1a6a7ae18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin')
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh | 80 | ||||
-rwxr-xr-x | coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh | 268 |
2 files changed, 139 insertions, 209 deletions
diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh index e00e2498..119a1008 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-systemsetup.sh @@ -37,69 +37,25 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" NTS_IP=10.212.2.216 -ExceptionGsettings1=100 -ExceptionGsettings2=101 -ExceptionGsettings3=102 -ExceptionNTS=103 -ExceptionProxy=104 -ExceptionGrub=105 - -try -( - echo "Set timezone to UTC." - sudo timedatectl set-timezone Etc/UTC || throw $ExceptionTimezone - echo "Timeout for blanking the screen (0 = never)" - gsettings set org.gnome.desktop.session idle-delay 0 || throw $ExceptionGsettings1 - echo "Prevents screen lock when screesaver goes active." - gsettings set org.gnome.desktop.screensaver lock-enabled false || throw $ExceptionGsettings2 - echo "Disable questions on shutdown." - gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true || throw $ExceptionGsettings3 - echo "Set grub timeout to 0" - sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub || throw $ExceptionGrub - sudo update-grub || throw $ExceptionGrub - - echo "Set Network Test Server address to $NTS_IP in /etc/hosts" - echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts || throw $ExceptionNTS - - if [ "$http_proxy" != "" ]; then - echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf || throw $ExceptionProxy - fi -) -catch || { - case $ex_code in - $ExceptionTimezone) - echo "Failed to set timezone to UTC" - exit 1; - ;; - $ExceptionGsettings1) - echo "Failed to disable black screen." - exit 1; - ;; - $ExceptionGsettings2) - echo "Failed to prevent screen lock." - exit 1; - ;; - $ExceptionGsettings3) - echo "Failed to disable questions on shutdown." - exit 1; - ;; - $ExceptionGrub) - echo "Failed to set grub timeout." - exit 1; - ;; - $ExceptionNTS) - echo "Failed to set network teset server address into /etc/hosts." - exit 1; - ;; - $ExceptionProxy) - echo "Failed to set proxy /etc/apt/apt.conf." - exit 1; - ;; - esac -} - +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +echo "Disable questions on shutdown." +gsettings set com.canonical.indicator.session suppress-logout-restart-shutdown true +echo "Set grub timeout to 0" +sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo update-grub + +echo "Set Network Test Server address to $NTS_IP in /etc/hosts" +echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +if [ "$http_proxy" != "" ]; then + echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf +fi diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh index 1f2139c1..40e07fe6 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh @@ -37,153 +37,127 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/try_catch.sh" +echo "Disabling auto update" +sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic +for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do + sudo systemctl stop $service + sudo systemctl disable $service +done -ExceptionAPTUpdate=100 -ExceptionAPT=101 -ExceptionSED=102 +# aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) +for i in `seq 10`; do + echo attempting to remove aptdaemon + sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true + # check that aptdaemon is no longer installed + which aptd > /dev/null || break + if [[ $i -eq 10 ]]; then + exit 1 + fi + sleep 10 +done -try -( - echo "Disabling auto update" - sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic || throw $ExceptionSED - for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do - sudo systemctl stop $service - sudo systemctl disable $service - done +# Git is not needed by builds themselves, but is nice to have +# immediately as one starts debugging +installPackages+=(git) +# 7zip is a needed decompressing tool +installPackages+=(p7zip-full) +# To be able to mount yocto-cache during builds +installPackages+=(nfs-common) +# libssl-dev provides headers for OpenSSL +installPackages+=(libssl-dev) +# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git +installPackages+=("^libxcb.*") +installPackages+=(libxkbcommon-dev) +installPackages+=(libxkbcommon-x11-dev) +installPackages+=(libx11-xcb-dev) +installPackages+=(libglu1-mesa-dev) +installPackages+=(libxrender-dev) +installPackages+=(libxi-dev) +# Enable linking to system dbus +installPackages+=(libdbus-1-dev) +# Needed libraries for WebEngine +installPackages+=(libudev-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libxss-dev) +# Common event loop handling +installPackages+=(libglib2.0-dev) +# MySQL support +installPackages+=(libmysqlclient-dev) +# PostgreSQL support +installPackages+=(libpq-dev) +# SQLite support +installPackages+=(libsqlite3-dev) +# ODBC support +installPackages+=(unixodbc-dev) +# Support for FreeType font engine +installPackages+=(libfreetype6-dev) +# Enable the usage of system jpeg libraries +installPackages+=(libjpeg-dev) +# Enable support for printer driver +installPackages+=(libcups2-dev) +# Install libraries needed for QtMultimedia to be able to support all plugins +installPackages+=(libasound2-dev) +installPackages+=(libgstreamer1.0-dev) +installPackages+=(libgstreamer-plugins-base1.0-dev) +installPackages+=(libgstreamer-plugins-good1.0-dev) +installPackages+=(libgstreamer-plugins-bad1.0-dev) +# Support for cross-building to x86 (needed by WebEngine boot2qt builds) +installPackages+=(g++-multilib) +# python2 development package +installPackages+=(python-pip) +# python3 development package +installPackages+=(python3-dev) +installPackages+=(python3-pip) +installPackages+=(python3-virtualenv) +# Needed to be able to build Yocto +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) +# Automates interactive applications (Needed by RTA to automate configure testing) +installPackages+=(expect) +installPackages+=(mesa-common-dev) +installPackages+=(libgl1-mesa-glx) +installPackages+=(libgl1-mesa-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(curl) +installPackages+=(libicu-dev) +installPackages+=(zlib1g-dev) +installPackages+=(zlib1g) +installPackages+=(openjdk-8-jdk) +installPackages+=(libgtk-3-dev) +installPackages+=(ninja-build) +installPackages+=(libssl-dev) +installPackages+=(libxcursor-dev) +installPackages+=(libxcomposite-dev) +installPackages+=(libxdamage-dev) +installPackages+=(libxrandr-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libxss-dev) +installPackages+=(libsrtp0-dev) +installPackages+=(libwebp-dev) +installPackages+=(libjsoncpp-dev) +installPackages+=(libopus-dev) +installPackages+=(libminizip-dev) +installPackages+=(libavutil-dev) +installPackages+=(libavformat-dev) +installPackages+=(libavcodec-dev) +installPackages+=(libevent-dev) +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperf) +installPackages+=(libasound2-dev) +installPackages+=(libpulse-dev) +installPackages+=(libxtst-dev) +installPackages+=(libnspr4-dev) +installPackages+=(libnss3-dev) +installPackages+=(libopenal-dev) +installPackages+=(libbluetooth-dev) +#VirtualBox for RTA +installPackages+=(virtualbox) +installPackages+=(dkms) - # aptdaemon is used by update notifiers and similar and there is no point in having those (the symptom is aptd holding a lock) - for i in `seq 10`; do - echo attempting to remove aptdaemon - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y remove aptdaemon || true - # check that aptdaemon is no longer installed - which aptd > /dev/null || break - if [[ $i -eq 10 ]]; then - throw $ExceptionAPT - fi - sleep 10 - done - - # Git is not needed by builds themselves, but is nice to have - # immediately as one starts debugging - installPackages+=(git) - # 7zip is a needed decompressing tool - installPackages+=(p7zip-full) - # To be able to mount yocto-cache during builds - installPackages+=(nfs-common) - # libssl-dev provides headers for OpenSSL - installPackages+=(libssl-dev) - # Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git - installPackages+=("^libxcb.*") - installPackages+=(libxkbcommon-dev) - installPackages+=(libxkbcommon-x11-dev) - installPackages+=(libx11-xcb-dev) - installPackages+=(libglu1-mesa-dev) - installPackages+=(libxrender-dev) - installPackages+=(libxi-dev) - # Enable linking to system dbus - installPackages+=(libdbus-1-dev) - # Needed libraries for WebEngine - installPackages+=(libudev-dev) - installPackages+=(libegl1-mesa-dev) - installPackages+=(libfontconfig1-dev) - installPackages+=(libxss-dev) - # Common event loop handling - installPackages+=(libglib2.0-dev) - # MySQL support - installPackages+=(libmysqlclient-dev) - # PostgreSQL support - installPackages+=(libpq-dev) - # SQLite support - installPackages+=(libsqlite3-dev) - # ODBC support - installPackages+=(unixodbc-dev) - # Support for FreeType font engine - installPackages+=(libfreetype6-dev) - # Enable the usage of system jpeg libraries - installPackages+=(libjpeg-dev) - # Enable support for printer driver - installPackages+=(libcups2-dev) - # Install libraries needed for QtMultimedia to be able to support all plugins - installPackages+=(libasound2-dev) - installPackages+=(libgstreamer1.0-dev) - installPackages+=(libgstreamer-plugins-base1.0-dev) - installPackages+=(libgstreamer-plugins-good1.0-dev) - installPackages+=(libgstreamer-plugins-bad1.0-dev) - # Support for cross-building to x86 (needed by WebEngine boot2qt builds) - installPackages+=(g++-multilib) - # python2 development package - installPackages+=(python-pip) - # python3 development package - installPackages+=(python3-dev) - installPackages+=(python3-pip) - installPackages+=(python3-virtualenv) - # Needed to be able to build Yocto - installPackages+=(chrpath) - installPackages+=(gawk) - installPackages+=(texinfo) - # Automates interactive applications (Needed by RTA to automate configure testing) - installPackages+=(expect) - installPackages+=(mesa-common-dev) - installPackages+=(libgl1-mesa-glx) - installPackages+=(libgl1-mesa-dev) - installPackages+=(libegl1-mesa-dev) - installPackages+=(curl) - installPackages+=(libicu-dev) - installPackages+=(zlib1g-dev) - installPackages+=(zlib1g) - installPackages+=(openjdk-8-jdk) - installPackages+=(libgtk-3-dev) - installPackages+=(ninja-build) - installPackages+=(libssl-dev) - installPackages+=(libxcursor-dev) - installPackages+=(libxcomposite-dev) - installPackages+=(libxdamage-dev) - installPackages+=(libxrandr-dev) - installPackages+=(libfontconfig1-dev) - installPackages+=(libxss-dev) - installPackages+=(libsrtp0-dev) - installPackages+=(libwebp-dev) - installPackages+=(libjsoncpp-dev) - installPackages+=(libopus-dev) - installPackages+=(libminizip-dev) - installPackages+=(libavutil-dev) - installPackages+=(libavformat-dev) - installPackages+=(libavcodec-dev) - installPackages+=(libevent-dev) - installPackages+=(bison) - installPackages+=(flex) - installPackages+=(gperf) - installPackages+=(libasound2-dev) - installPackages+=(libpulse-dev) - installPackages+=(libxtst-dev) - installPackages+=(libnspr4-dev) - installPackages+=(libnss3-dev) - installPackages+=(libopenal-dev) - installPackages+=(libbluetooth-dev) - #VirtualBox for RTA - installPackages+=(virtualbox) - installPackages+=(dkms) - - echo "Running update for apt" - sudo apt-get update - echo "Installing packages" - sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" || throw $ExceptionAPT -) -catch || { - case $ex_code in - $ExceptionAPTUpdate) - echo "Failed to run APT update." - exit 1; - ;; - $ExceptionAPT) - echo "Failed to install package." - sudo lsof /var/lib/dpkg/lock - exit 1; - ;; - $ExceptionSED) - echo "Failed to disable auto update." - exit 1; - ;; - esac -} +echo "Running update for apt" +sudo apt-get update +echo "Installing packages" +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]}" |