From e8157d1f5dd4ba3e1abc21be699439f803ee4586 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 12 Jan 2012 14:22:36 -0500 Subject: [PATCH] -small fix to upgrade test script --- dev_tools/fabric/fab_release_test.py | 8 ++++---- dev_tools/fabric/run.sh | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dev_tools/fabric/fab_release_test.py b/dev_tools/fabric/fab_release_test.py index 9f4840c47..85b8fc317 100644 --- a/dev_tools/fabric/fab_release_test.py +++ b/dev_tools/fabric/fab_release_test.py @@ -108,7 +108,7 @@ def create_fresh_os(vm_name, lucid=False, debian=False): do_local('VBoxManage snapshot %s restore fresh_install'%vm_name) - do_local('VBoxManage modifyvm "%s" --bridgeadapter1 wlan0'%vm_name) + do_local('VBoxManage modifyvm "%s" --bridgeadapter1 eth0'%vm_name) do_local('VBoxManage startvm %s'%vm_name) print "Please wait while attempting to acquire IP address" @@ -139,8 +139,8 @@ def create_fresh_os(vm_name, lucid=False, debian=False): #installed before. do_sudo('echo "rabbitmq-server rabbitmq-server/upgrade_previous note" | debconf-set-selections') - #if debian: - #append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True) + if debian: + append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True) def ubuntu_lucid_32(fresh_os=True): if (fresh_os): @@ -189,7 +189,7 @@ def airtime_181_tar(): airtime_18x_tar("airtime", "1.8.1") def airtime_182_tar(): - airtime_18x_tar("airtime-1.8.2" "1.8.2") + airtime_18x_tar("airtime-1.8.2", "1.8.2") def airtime_18x_tar(root_dir, version): do_sudo('apt-get update') diff --git a/dev_tools/fabric/run.sh b/dev_tools/fabric/run.sh index 5f259b66b..9cfcadf54 100755 --- a/dev_tools/fabric/run.sh +++ b/dev_tools/fabric/run.sh @@ -2,12 +2,11 @@ exec 2>&1 -target="airtime_git_branch" -#airtime_versions=("" "airtime_182_tar" "airtime_190_tar" "airtime_191_tar" "airtime_192_tar" "airtime_192_tar" "airtime_194_tar" "airtime_195_tar") -airtime_versions=("airtime_191_tar" "airtime_192_tar" "airtime_192_tar" "airtime_194_tar" "airtime_195_tar") -#airtime_versions=("") -ubuntu_versions=("ubuntu_natty_64") -#ubuntu_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_maverick_32" "ubuntu_maverick_64" "ubuntu_natty_32" "ubuntu_natty_64" "ubuntu_oneiric_32" "ubuntu_oneiric_64" "debian_squeeze_32" "debian_squeeze_64") +target="airtime_git_branch:airtime-2.0.0-RC1" +airtime_versions=("" "airtime_180_tar" "airtime_181_tar" "airtime_182_tar" "airtime_190_tar" "airtime_191_tar" "airtime_192_tar" "airtime_193_tar" "airtime_194_tar" "airtime_195_tar") +#airtime_versions=("airtime_191_tar" "airtime_192_tar" "airtime_192_tar" "airtime_194_tar" "airtime_195_tar") +ubuntu_versions=("ubuntu_lucid_32" "ubuntu_lucid_64" "ubuntu_maverick_32" "ubuntu_maverick_64" "ubuntu_natty_32" "ubuntu_natty_64" "ubuntu_oneiric_32" "ubuntu_oneiric_64" "debian_squeeze_32" "debian_squeeze_64") +#ubuntu_versions=("ubuntu_natty_64") num1=${#ubuntu_versions[@]} num2=${#airtime_versions[@]}