← Back to branch summary

~andrewjbeach/juju-ci-tools/make-local-patcher

« back to all changes in this revision

Viewing changes to run-deploy-job.bash

  • Committer: Aaron Bentley
  • Date: 2016-03-18 03:02:01 UTC
  • mto: This revision was merged to the branch mainline in revision 1323.
  • Revision ID: aaron.bentley@canonical.com-20160318030201-ki8wfpaeawgh9oqz
assess_cs_staging pokes state server via admin model.

Show diffs side-by-side

added added

removed removed

Lines of Context:
run-deploy-job.bash
26
26
package=$($SCRIPTS/jujuci.py get-package-name $VERSION)
27
27
s3cmd --config $JUJU_HOME/juju-qa.s3cfg sync \
28
28
  s3://juju-qa-data/juju-ci/products/version-$revision_build . \
29
 
  --exclude '*' --include $package || true
 
29
  --exclude '*' --include $package
30
30
# Find the deb with the highest build- number.
31
31
deb=$(find . -name $package|sed -r 's/.*build-([0-9]+)\/.*/\1 \0/'|sort -g|\
32
32
      tail -n1| cut -f 2 -d ' ')
44
44
fi
45
45
if [[ $VERSION =~ ^2\..*$ && $extra_args = "--upgrade" ]]; then
46
46
    CURRENT_VERSION=$(juju version | cut -d '-' -f 1)
47
 
    if [[ ! $CURRENT_VERSION =~ ^2\..*$ ]]; then
 
47
    if [[ ! $CURRENT_VERSION =~ ^1\.25\.[5-9].*$ ]]; then
48
48
        echo "Juju $CURRENT_VERSION does not support upgrade to $VERSION."
49
49
        exit 0
50
50
    fi