diff options
| author | Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> | 2014-12-15 13:15:22 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com> | 2015-11-02 11:49:53 +0100 |
| commit | 67afb256a6f5073e2ac97848938a7fffe67a6412 (patch) | |
| tree | 2a6acef47bd0257c5288b2f8ead55b19bfbdc336 | |
| parent | 1881441d3cd65e3181cf12540db1aa28a6cc4a31 (diff) | |
| download | qtbase-67afb256a6f5073e2ac97848938a7fffe67a6412.tar.gz | |
network test server: make SPDY module dependent of architecture
Cherry-picked from sysadmin repo:
8903bae601163b673845e28ff163b55ae7fb37ff
Change-Id: I617bd622c8e6cfbc25cb4c82f3e2fc02ffd48238
Author: Peter Hartmann <phartmann@blackberry.com>
Signed-off-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
| -rw-r--r-- | tests/auto/network/support/modules/network_test_server/manifests/apache2.pp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp b/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp index ea5217a287..aa69db2fb7 100644 --- a/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp +++ b/tests/auto/network/support/modules/network_test_server/manifests/apache2.pp @@ -3,10 +3,18 @@ class network_test_server::apache2 { "apache2": ensure => present; } + $spdy_filename = $::architecture ? { + i386 => "mod-spdy-beta_current_i386.deb", + x86 => "mod-spdy-beta_current_i386.deb", + x86_64 => "mod-spdy-beta_current_amd64.deb", + amd64 => "mod-spdy-beta_current_amd64.deb", + default => "mod-spdy-beta_current_amd64.deb", + } + exec { "download SPDY module": - command => "/usr/bin/wget https://dl-ssl.google.com/dl/linux/direct/mod-spdy-beta_current_i386.deb --directory-prefix=/home/qt-test-server", - creates => "/home/qt-test-server/mod-spdy-beta_current_i386.deb", + command => "/usr/bin/wget https://dl-ssl.google.com/dl/linux/direct/$spdy_filename --directory-prefix=/home/qt-test-server", + creates => "/home/qt-test-server/$spdy_filename", notify => Service["apache2"] ; } @@ -15,7 +23,7 @@ class network_test_server::apache2 { "mod_spdy": ensure => installed, provider => dpkg, - source => "/home/qt-test-server/mod-spdy-beta_current_i386.deb", + source => "/home/qt-test-server/$spdy_filename", notify => Service["apache2"], require => [ Package["apache2"], Exec["download SPDY module"] ] } |