diff options
| author | Tony SarajΓ€rvi <tony.sarajarvi@digia.com> | 2013-10-10 13:13:07 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-11 08:07:40 +0200 |
| commit | cb28a80b7fed922d9a8a6b5e25be962629f6dbfa (patch) | |
| tree | 5e02f03d68f68f41f0446d4cf1385e741e78394d | |
| parent | 90dc51807a6f70081a27f6d6490408aaa0732f13 (diff) | |
Move OpenJDKs install to proper place in Puppet and limit to Ubuntu
OpenJDK is installed from ci_tester and pkg_tester currently.
It isn't exactly the proper place, so this moves it to qt_prereqs.
Meanwhile, it's also moved from generally being installed in all
linux platforms to only being installed in Ubuntu, since OpenSuSE
doesn't need this.
Task-number: QTQAINFRA-745
Change-Id: If112e42c58bbd69da3af710ccda629b5972e04e7
Reviewed-by: Heikki Halmet <heikki.halmet@digia.com>
| -rw-r--r-- | puppet/modules/ci_tester/manifests/linux.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/packaging_tester/manifests/linux.pp | 5 | ||||
| -rw-r--r-- | puppet/modules/qt_prereqs/manifests/ubuntu.pp | 4 |
3 files changed, 4 insertions, 10 deletions
diff --git a/puppet/modules/ci_tester/manifests/linux.pp b/puppet/modules/ci_tester/manifests/linux.pp index bb052b6..75fb9f9 100644 --- a/puppet/modules/ci_tester/manifests/linux.pp +++ b/puppet/modules/ci_tester/manifests/linux.pp @@ -7,11 +7,6 @@ class ci_tester::linux inherits ci_tester::base { include vmware_tools } - package { - # for android: - "openjdk-6-jdk": ensure => installed; - } - # Allow test machines to install modules from cpan under $HOME/perl5 include homedir_cpan diff --git a/puppet/modules/packaging_tester/manifests/linux.pp b/puppet/modules/packaging_tester/manifests/linux.pp index d70202e..61803a5 100644 --- a/puppet/modules/packaging_tester/manifests/linux.pp +++ b/puppet/modules/packaging_tester/manifests/linux.pp @@ -8,11 +8,6 @@ class packaging_tester::linux inherits packaging_tester::base { } package { - # for android: - "openjdk-6-jdk": ensure => installed; - } - - package { # for configure test cases "expect": ensure => installed; } diff --git a/puppet/modules/qt_prereqs/manifests/ubuntu.pp b/puppet/modules/qt_prereqs/manifests/ubuntu.pp index 3a0aa84..7dbff99 100644 --- a/puppet/modules/qt_prereqs/manifests/ubuntu.pp +++ b/puppet/modules/qt_prereqs/manifests/ubuntu.pp @@ -144,6 +144,10 @@ class qt_prereqs::ubuntu inherits qt_prereqs::unix { } } + package { + # for android: + "openjdk-6-jdk": ensure => installed; + } } |