Update the setup of the network test server

+ update expired repo key for puppetlabs
+ use old-releases.ubuntu.com, as the only location still having 10.04
+ update instructions: script only runs with bash, not sh
+ update puppetlabs repo to install package from 12.04 even for 10.04,
  as the latter no longer exists online
+ the previous step installs puppet v3.8 instead of v2.7, so minor updates
  to the policy were needed too
+ update dante-server package URL to point to different repo, because the
  previous did not include amd64 package.

Change-Id: Ie00be1aa393ca5607029e7694353f12e780f7beb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>

4 files changed, 15 insertions, 10 deletions

diff --git a/README.network_test_server.txt b/README.network_test_server.txt
index aed442b..9cfdeeb 100644
--- a/README.network_test_server.txt
+++ b/README.network_test_server.txt
@@ -29,6 +29,10 @@ Don't enable automatic updates.
 
 Don't install any extra packages (except openssh-server, if you need it).
 
+Fix apt-sources.list to point to active repositories:
+
+# sed -i 's/security.ubuntu.com/old-releases.ubuntu.com/' /etc/apt/sources.list
+
 The machine needs outbound access to the Internet for accessing this git
 repository and Ubuntu package repositories, and needs to accept inbound
 access on whatever local network contains the device(s) on which you'll
@@ -47,10 +51,9 @@ It is recommended that you watch the system log during this step.
 For example, run `tail -f /var/log/syslog &' before proceeding.
 
 From this git repo, put bootstrap/ubuntu1004_bootstrap.sh onto the machine,
-and run it.  e.g.
+and run it with bash.
 
-# wget https://code.qt.io/cgit/qtqa/sysadmin.git/plain/bootstrap/ubuntu1004_bootstrap.sh \
-    && sh ./ubuntu1004_bootstrap.sh git://code.qt.io/qtqa/sysadmin.git
+# bash ./ubuntu1004_bootstrap.sh git://code.qt.io/qtqa/sysadmin.git
 
 This will install and run puppet.
 
@@ -64,7 +67,7 @@ track changes to this git repository.
 
 Due to minor bootstrap issues, in order to complete the setup it will most
 likely be necessary to run puppet a second time.  You may wait for this to
-happen `naturally' or manually run /var/qtqa/sysadmin/puppet/sync_and_run.sh .
+happen `naturally' or manually run /var/qtqa/sysadmin/puppet/sync_and_run.pl .
 
 It is recommended to reboot the machine after the initial puppet setup to
 ensure that all services are correctly launched after boot, and that no outdated
diff --git a/bootstrap/ubuntu1004_bootstrap.sh b/bootstrap/ubuntu1004_bootstrap.sh
index e4bbcd5..8eda350 100755
--- a/bootstrap/ubuntu1004_bootstrap.sh
+++ b/bootstrap/ubuntu1004_bootstrap.sh
@@ -66,8 +66,9 @@ fi
 PUPPETLIST_FILE=/etc/apt/sources.list.d/bootstrap-puppet.list
 if ! test -e $PUPPETLIST_FILE; then
     echo Setting up bootstrap-puppet.list...
-    echo -e 'deb http://apt.puppetlabs.com/ lucid main\ndeb-src http://apt.puppetlabs.com/ lucid main' > $PUPPETLIST_FILE
-    apt-key adv --keyserver keyserver.ubuntu.com --recv 4BD6EC30
+    echo 'deb http://apt.puppetlabs.com/ precise main'     > $PUPPETLIST_FILE
+    echo 'deb-src http://apt.puppetlabs.com/ precise main' >> $PUPPETLIST_FILE
+    apt-key adv --keyserver keyserver.ubuntu.com --recv 7F438280EF8D349F
     apt-get update
 else
     echo bootstrap-puppet.list already exist
diff --git a/puppet/modules/apt_backports/manifests/init.pp b/puppet/modules/apt_backports/manifests/init.pp
index 31b6cde..7752bc8 100644
--- a/puppet/modules/apt_backports/manifests/init.pp
+++ b/puppet/modules/apt_backports/manifests/init.pp
@@ -1,6 +1,6 @@
 class apt_backports(
     $base_url = $::operatingsystem ? {
-        Ubuntu => "http://archive.ubuntu.com/ubuntu",
+        Ubuntu => "http://old-releases.ubuntu.com/ubuntu",
         Debian => "http://backports.debian.org/debian-backports",
     },
     $sections = $::operatingsystem ? {
diff --git a/puppet/modules/network_test_server/manifests/linux/danted.pp b/puppet/modules/network_test_server/manifests/linux/danted.pp
index b9aa037..de89e62 100644
--- a/puppet/modules/network_test_server/manifests/linux/danted.pp
+++ b/puppet/modules/network_test_server/manifests/linux/danted.pp
@@ -7,13 +7,14 @@ class network_test_server::linux::danted {
         # old version too, but the tests should really be fixed.
         $dante_deb = $architecture ? {
             i386    =>  'dante-server_1.1.14-2_i386.deb',
-            x86_64  =>  'dante-server_1.1.14-2_ia64.deb',
-            default =>  err("architecture $architecture is not supported!"),
+            x86_64  =>  'dante-server_1.1.14-2_amd64.deb',
+            amd64   =>  'dante-server_1.1.14-2_amd64.deb',
+            default =>  "architecture $architecture is not supported!",
         }
 
         exec { "fetch old dante-server":
             creates =>  "/tmp/$dante_deb",
-            command =>  "/usr/bin/wget -O /tmp/$dante_deb http://snapshot.debian.org/archive/debian/20050312T000000Z/pool/main/d/dante/$dante_deb",
+            command =>  "/usr/bin/wget -O /tmp/$dante_deb http://old-releases.ubuntu.com/ubuntu/pool/universe/d/dante/$dante_deb",
         }
 
         package { "dante-server":