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

Subscribers

People subscribed via source and target branches