← Back to branch summary

~gz/juju-ci-tools/gotestwin_rev

« back to all changes in this revision

Viewing changes to run-deploy-job.bash

  • Committer: Aaron Bentley
  • Date: 2015-03-18 16:40:22 UTC
  • mfrom: (906.1.1 run-deploy-job-extra)
  • Revision ID: aaron.bentley@canonical.com-20150318164022-l0jlg5dl8tmcrosf
Pass extra args to deploy_job.

Show diffs side-by-side

added added

removed removed

Lines of Context:
run-deploy-job.bash
15
15
elif [ "$1" = "deploy" ]; then
16
16
  extra_args=""
17
17
else
18
 
  echo "Unknown action $2"
 
18
  echo "Unknown action $1"
19
19
  exit 1
20
20
fi
 
21
series=$2
 
22
timeout=$4
 
23
shift 4
21
24
$SCRIPTS/jujuci.py -v setup-workspace --clean-env $JOB_NAME $WORKSPACE
22
25
JUJU_BIN=$(dirname $($SCRIPTS/jujuci.py get-juju-bin))
23
26
$SCRIPTS/jujuci.py get build-revision buildvars.bash ./
27
30
rev=${REVNO-$(echo $REVISION_ID | head -c7)}
28
31
echo "Testing $BRANCH $rev on $ENV"
29
32
EOT
30
 
timeout -s INT $4 $SCRIPTS/deploy_job.py --new-juju-bin $JUJU_BIN\
31
 
  --series $2 $ENV $WORKSPACE/artifacts $JOB_NAME $extra_args
 
33
timeout -s INT $timeout $SCRIPTS/deploy_job.py --new-juju-bin $JUJU_BIN\
 
34
  --series $series $ENV $WORKSPACE/artifacts $JOB_NAME $extra_args "$@"