Merge lp:~sseman/juju-ci-tools/update-client-server-script into lp:juju-ci-tools

[Seman]

This branch removes the following steps from the client-server test:
  1. Copy the old and candidate Juju from S3 to local files.
  2. Copy the old and candidate Juju from local files to OS X and Windows machines.

Since we already created script that copies the old and candidate Juju directly to OS X and Windows machines before running the client-server test, there is no need to copy these files every time we run the test.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'run-client-server-test-remote.bash'
--- run-client-server-test-remote.bash	2015-09-04 17:49:43 +0000
+++ run-client-server-test-remote.bash	2015-09-23 06:44:38 +0000
@@ -5,15 +5,22 @@
 export JUJU_REPOSITORY=$HOME/repository
 export SCRIPT=$HOME/juju-ci-tools
 export PATH=$HOME/juju-ci-tools:$PATH
-set -x
 usage() {
-    echo "usage: $0 server client [--agent-stream stream | --agent-url url]"
+    echo "usage: $0 candidate-version old-juju-version new-to-old [--agent-stream stream | --agent-url url]"
     exit 1
 }
-test $# -ge 2 || usage
-server="$1"
-client="$2"
-shift 2
+test $# -ge 3 || usage
+candidate_version="$1"
+old_juju_version="$2"
+new_to_old="$3"
+shift 3
+
+set -x
+# Extract the client and the server.
+mkdir candidate
+mkdir old-juju
+tar zxf $HOME/candidate/osx/juju-$candidate_version-osx.tar.gz -C candidate
+tar zxf $HOME/old-juju/osx/juju-$old_juju_version-osx.tar.gz -C old-juju
 
 # Create ssh home.
 ssh_home="/tmp/sshhome"
@@ -22,14 +29,19 @@
 cp $JUJU_HOME/staging-juju-rsa.pub $ssh_home/.ssh/id_rsa.pub
 export HOME=$ssh_home
 
-# Extract the client and the server.
-tar zxf $server -C server
-tar zxf $client -C client
-server_juju=$(find server -name juju)
-client_juju=$(find client -name juju)
+
+if [[ "$new_to_old" == "true" ]]; then
+  server=$(find candidate -name juju)
+  client=$(find old-juju -name juju)
+else
+  server=$(find old-juju -name juju)
+  client=$(find candidate -name juju)
+fi
+echo "Server: " `$server --version`
+echo "Client: " `$client --version`
 
 mkdir logs
 env=compatibility-control
-~/Bin/juju destroy-environment --force -y $env || true
-$SCRIPT/assess_heterogeneous_control.py $server_juju $client_juju \
-    test-reliability-aws $env logs "$@"
+/Users/jenkins/Bin/juju destroy-environment --force -y $env || true
+$SCRIPT/assess_heterogeneous_control.py $server $client \
+  test-reliability-aws $env logs "$@"
 
=== modified file 'run-client-server-test.bash'
--- run-client-server-test.bash	2015-09-08 17:12:47 +0000
+++ run-client-server-test.bash	2015-09-23 06:44:38 +0000
@@ -4,85 +4,52 @@
 export PATH=$HOME/workspace-runner:$PATH
 
 usage() {
-    echo "usage: $0 old-version candidate-version new-to-old client-os revision-build log-dir"
+    echo "usage: $0 old-version candidate-version new-to-old client-os log-dir"
     exit 1
 }
-test $# -eq 6 || usage
+test $# -eq 5 || usage
 old_version="$1"
 candidate_version="$2"
 new_to_old="$3"
 client_os="$4"
-revision_build="$5"
-log_dir="$6"
+log_dir="$5"
 
 set -x
+
+if [[ "$new_to_old" == "true" ]]; then
+    echo "Using weekly streams for unreleased version"
+    agent_arg="--agent-url http://juju-dist.s3.amazonaws.com/weekly/tools"
+else
+    echo "Using official proposed (or released) streams"
+    agent_arg="--agent-stream proposed"
+fi
+
 if [[ "$client_os" == "ubuntu" ]]; then
-    old_juju=$(find $HOME/old-juju/$old_version -name juju)
-    candidate_juju=$(find $HOME/candidate/$candidate_version -name juju)
+    server=$(find $HOME/old-juju/$old_version -name juju)
+    client=$(find $HOME/candidate/$candidate_version -name juju)
+    if [[ "$new_to_old" == "true" ]]; then
+        client=$(find $HOME/old-juju/$old_version -name juju)
+        server=$(find $HOME/candidate/$candidate_version -name juju)
+    fi
+    echo "Server: " `$server --version`
+    echo "Client: " `$client --version`
 elif [[ "$client_os" == "osx" ]]; then
-    package=juju-$candidate_version-osx.tar.gz
-    build_dir="build-osx-client"
-    old_package=juju-$old_version-osx.tar.gz
-    archive_dir="osx"
     user_at_host="[e-mail]"
     remote_script="run-client-server-test-remote.bash"
 elif [[ "$client_os" == "windows" ]]; then
-    package=juju-setup-$candidate_version.exe
-    build_dir="build-win-client"
-    old_package=juju-$old_version-win.zip
-    archive_dir="win"
+    remote_script="run-win-client-server-remote.bash"
     user_at_host="[e-mail]"
-    remote_script="run-win-client-server-remote.bash"
 else
     echo "Unkown client OS."
     exit 1
 fi
 
-# Get OS X and Windows Juju from S3.
-if [[ "$client_os" == "osx" ]] || [[ "$client_os" == "windows" ]]; then
-    temp_dir=$(mktemp -d)
-    s3cmd --config $JUJU_HOME/juju-qa.s3cfg sync \
-        s3://juju-qa-data/juju-ci/products/version-$revision_build/$build_dir \
-        $temp_dir --exclude '*' --include $package
-    candidate_juju=$(find $temp_dir -name $package)
-    if [ "$client_os" == "windows" ]; then
-        # Extract Windows exe file and compress it.
-        innoextract -e $candidate_juju -d $temp_dir
-        zip -D $temp_dir/juju-$candidate_version-win.zip $temp_dir/app/juju.exe
-        candidate_juju=$temp_dir/juju-$candidate_version-win.zip
-    fi
-    # Get the old juju from S3.
-    old_temp_dir=$(mktemp -d)
-    s3cmd --config $JUJU_HOME/juju-qa.s3cfg sync \
-        s3://juju-qa-data/client-archive/$archive_dir $old_temp_dir --exclude '*' \
-        --include $old_package
-    old_juju=$(find $old_temp_dir -name $old_package)
-fi
-
-if [[ "$new_to_old" == "true" ]]; then
-    server=$candidate_juju
-    client=$old_juju
-    echo "Using weekly streams for unreleased version"
-    agent_arg="--agent-url http://juju-dist.s3.amazonaws.com/weekly/tools"
-else
-    server=$old_juju
-    client=$candidate_juju
-    echo "Using official proposed (or released) streams"
-    agent_arg="--agent-stream proposed"
-fi
-
 run_remote_script() {
     cat > temp-config.yaml <<EOT
 install:
     remote:
         - $SCRIPTS/$remote_script
-    client:
-        - $client
-    server:
-        - $server
-command: [remote/$remote_script,
-          "server/$(basename $server)", "client/$(basename $client)",
-          "$agent_arg"]
+command: [remote/$remote_script, "$candidate_version", "$old_version", "$new_to_old", "$agent_arg"]
 EOT
     workspace-run temp-config.yaml $user_at_host
 }
@@ -103,10 +70,4 @@
         rm -rf $log_dir/*
     fi
 done
-
-# Cleanup
-if [[ "$client_os" == "osx" ]] || [[ "$client_os" == "windows" ]]; then
-    rm -rf $temp_dir
-    rm -rf $old_temp_dir
-fi
 exit $RESULT
 \ No newline at end of file
 
=== modified file 'run-win-client-server-remote.bash'
--- run-win-client-server-remote.bash	2015-09-04 17:49:43 +0000
+++ run-win-client-server-remote.bash	2015-09-23 06:44:38 +0000
@@ -1,16 +1,28 @@
 # This script is intended to run on Windows. It extracts compressed Juju binary
 # in a ZIP archive and run the client-server test.
-set -eu
-
-server="$1"
-client="$2"
-shift 2
-
-/cygdrive/c/progra~2/7-Zip/7z.exe e -y -oserver $server
-/cygdrive/c/progra~2/7-Zip/7z.exe e -y -oclient $client
+set -eux
+
+candidate_version="$1"
+old_juju_version="$2"
+new_to_old="$3"
+shift 3
+
+/cygdrive/c/progra~2/7-Zip/7z.exe e -y -oold-juju C:\\users\\Administrator\\old-juju\\win\\juju-$old_juju_version-win.zip
+/cygdrive/c/progra~2/innoextract/innoextract.exe -e C:\\users\\Administrator\\candidate\\win\\juju-setup-$candidate_version.exe -d candidate
+
+if [ "$new_to_old" = "true" ]; then
+  echo "Server:" `candidate/app/juju.exe --version`
+  echo "Client:" `old-juju/juju.exe --version`
+  server=candidate\\app\\juju.exe
+  client=old-juju\\juju.exe
+else
+  echo "Server:" `old-juju/juju.exe --version`
+  echo "Client:" `candidate/app/juju.exe --version`
+  client=candidate\\app\\juju.exe
+  server=old-juju\\juju.exe
+fi
 
 mkdir logs
 juju destroy-environment --force -y compatibility-control || true
 python C:\\users\\Administrator\\juju-ci-tools\\assess_heterogeneous_control.py \
-  server/juju.exe client/juju.exe test-win-client-server \
-  compatibility-control logs "$@"
 \ No newline at end of file
+  $server $client test-win-client-server compatibility-control logs "$@"
 \ No newline at end of file