Merge lp:~sseman/juju-ci-tools/remove-win-cs-script into lp:juju-ci-tools

Proposed by Seman
Status: Merged
Merged at revision: 1088
Proposed branch: lp:~sseman/juju-ci-tools/remove-win-cs-script
Merge into: lp:juju-ci-tools
Diff against target: 68 lines (+0/-64)
1 file modified
run-win-client-server.bash (+0/-64)
To merge this branch: bzr merge lp:~sseman/juju-ci-tools/remove-win-cs-script
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+270467@code.launchpad.net

Description of the change

This branch removes the "run-win-client-server.bash" file. This script was created to run the client-server test remotely on Windows by calling "run-win-client-server-remote.bash". After updating the "run-client-server-test.bash", there is no need for this file. The "run-client-server-test.bash script now can handle running client-server test on OS X and Windows.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed file 'run-win-client-server.bash'
--- run-win-client-server.bash 2015-09-01 21:34:32 +0000
+++ run-win-client-server.bash 1970-01-01 00:00:00 +0000
@@ -1,64 +0,0 @@
1#!/bin/bash
2set -eu
3: ${SCRIPTS=$(readlink -f $(dirname $0))}
4export SCRIPTS
5export JUJU_HOME=$HOME/cloud-city
6source $JUJU_HOME/juju-qa.jujuci
7export PATH=$HOME/workspace-runner:$PATH
8
9usage() {
10 echo "usage: $0 old-version candidate-version new-to-old agent-arg"
11 echo "Example: $0 1.21.1 1.24.3 false \"--agent-stream proposed\" "
12 exit 1
13}
14test $# -eq 4 || usage
15
16old_version="$1"
17candidate_version="$2"
18new_to_old="$3"
19agent_arg="$4"
20
21set -x
22# Get revision build from the buildvars file.
23buildvars_path=$HOME/candidate/$candidate_version/buildvars.json
24revision_build=$(grep revision_build $buildvars_path | grep -Eo '[0-9]{1,}')
25# Windows installer package.
26package=juju-setup-$candidate_version.exe
27
28# Get the candidate juju from S3 using the revision build number.
29temp_dir=$(mktemp -d)
30s3cmd --config $JUJU_HOME/juju-qa.s3cfg sync \
31 s3://juju-qa-data/juju-ci/products/version-$revision_build/build-win-client \
32 $temp_dir --exclude '*' --include $package
33installer=$(find $temp_dir -name $package)
34innoextract -e $installer -d $temp_dir
35zip -D $temp_dir/juju-$candidate_version-win.zip $temp_dir/app/juju.exe
36candidate_juju=$temp_dir/juju-$candidate_version-win.zip
37
38# Get the old juju from S3.
39old_package=juju-$old_version-win.zip
40old_temp_dir=$(mktemp -d)
41s3cmd --config $JUJU_HOME/juju-qa.s3cfg sync \
42 s3://juju-qa-data/client-archive/win $old_temp_dir --exclude '*' \
43 --include $old_package
44old_juju=$(find $old_temp_dir -name $old_package)
45
46if [ "$new_to_old" == "true" ]; then
47 server=$candidate_juju
48 client=$old_juju
49else
50 server=$old_juju
51 client=$candidate_juju
52fi
53
54cat > $old_temp_dir/temp-config.yaml <<EOT
55install:
56 remote:
57 - $SCRIPTS/run-win-client-server-remote.bash
58 - "$server"
59 - "$client"
60command: [remote/run-win-client-server-remote.bash,
61 "remote/$(basename $server)", "remote/$(basename $client)",
62 "$agent_arg"]
63EOT
64workspace-run $old_temp_dir/temp-config.yaml Administrator@win-slave.vapour.ws

Subscribers

People subscribed via source and target branches