diff options
| author | Heikki Halmet <heikki.halmet@digia.com> | 2014-10-22 10:16:35 +0300 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2014-10-27 12:52:22 +0100 |
| commit | 7bf3521fae504ef893d825111c4ff15543c1d243 (patch) | |
| tree | 4f0fd3657095289c9da01b1953892e16ef384bb7 /puppet/modules | |
| parent | 1d3d10fc91479dbac324ec3ef94914449babc62d (diff) | |
Update Android sdk for Ubuntu
This change will udpate Android sdk version to r23.0.2 in all Ubuntus.
SDK $URL is pointing to $INPUT which stores updated and compressed
sdk folder. This change was made because SDK update command couldn't
be automated for license query reason.
Task-number: QTQAINFRA-904
Change-Id: If5b3e07269822dfb44abb735fe5eb11b0858a8fe
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Diffstat (limited to 'puppet/modules')
| -rw-r--r-- | puppet/modules/android/manifests/linux.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/puppet/modules/android/manifests/linux.pp b/puppet/modules/android/manifests/linux.pp index 653d585..99a9102 100644 --- a/puppet/modules/android/manifests/linux.pp +++ b/puppet/modules/android/manifests/linux.pp @@ -30,8 +30,7 @@ class android::linux && wget $url/${filename} -O - | tar -C $target -$options \ && mv ${target}/${directory} ${generic_dir} \ && echo $filename > ${generic_dir}/version.txt \ - && chown -R $testuser: $generic_dir \ - && (if [ $generic_dir == $target/sdk ]; then ${generic_dir}/tools/android update sdk --no-ui; fi)'", + && chown -R $testuser: $generic_dir'", unless => "/bin/bash -c '\ grep \"$filename\" ${generic_dir}/version.txt'", require => File["$target"], @@ -49,11 +48,11 @@ class android::linux generic_dir => "${target}/ndk", ; "sdk": - filename => "android-sdk_r21.0.1-linux.tgz", - directory => "android-sdk-linux", + filename => "android-sdk_r23.0.2-linux.tar.gz", + directory => "android-sdk-r2302", options => "zx", target => "$target", - url => "$url", + url => "http://ci-files01-hki.ci.local/input/ubuntu", generic_dir => "${target}/sdk", ; } |