diff options
author | Joni Jäntti <joni.jantti@qt.io> | 2017-11-23 13:44:19 +0200 |
---|---|---|
committer | Tony Sarajärvi <tony.sarajarvi@qt.io> | 2017-12-29 13:16:32 +0000 |
commit | fcc0feaacb91ab5aefb212d351dcea7c728eefa5 (patch) | |
tree | 2d78a43ab042a2863dccb6e3373ff3bf96e1ee1a /coin/provisioning/common | |
parent | d29192ad3f499bd09da0e811d03f60d6a7aa6476 (diff) |
Add clean Ubuntu 16.04 provisioning
Currently Ubuntu 16.04 template has stuff installed on its tier 1. We
want to have a clean installed tier 1 and install everything on it
during provisioning. This will save some disk space on our hosts.
Task-number: QTQAINFRA-1574
Change-Id: Ia7e6df62835a8e31943c00996f12ac70c6c71aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Diffstat (limited to 'coin/provisioning/common')
-rw-r--r-- | coin/provisioning/common/android_linux.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/coin/provisioning/common/android_linux.sh b/coin/provisioning/common/android_linux.sh index ee3008c1..232326b7 100644 --- a/coin/provisioning/common/android_linux.sh +++ b/coin/provisioning/common/android_linux.sh @@ -79,8 +79,11 @@ try rm "$toolsTargetFile" || throw $ExceptionRmTools echo "Changing ownership of Android files." - sudo chown -R qt:wheel "$targetFolder" - + if uname -a |grep -q "el6\|el7"; then + sudo chown -R qt:wheel "$targetFolder" + else + sudo chown -R qt:users "$targetFolder" + fi echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" || throw $ExceptionSdkManager |