← Back to branch summary

~abentley/juju-ci-tools/client-from-config-4

« back to all changes in this revision

Viewing changes to test-restricted-network

  • Committer: Curtis Hovey
  • Date: 2016-02-19 06:41:06 UTC
  • Revision ID: curtis@canonical.com-20160219064106-j5otfg3qwdkarmeu
Revert juju-core2 support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test-restricted-network
50
50
    ubuntu@$instance_name lsb_release -sr)
51
51
ARCH=$(ssh -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile /dev/null' \
52
52
    ubuntu@$instance_name dpkg --print-architecture)
53
 
MAJOR=$(echo "$VERSION" | sed -e 's/\..*//; s/1//')
54
53
 
55
 
juju_core_deb="juju-core${MAJOR}_$VERSION-0ubuntu1~$RELEASE.1~juju1_$ARCH.deb"
56
 
juju_local_deb=""
 
54
juju_local_deb="juju-local_$VERSION-0ubuntu1~$RELEASE.1~juju1_all.deb"
 
55
juju_core_deb="juju-core_$VERSION-0ubuntu1~$RELEASE.1~juju1_$ARCH.deb"
57
56
 
58
57
if [ -e debs ]; then
59
58
  rm -R debs
60
59
fi
61
60
mkdir -p debs
62
 
if [[ -z $MAJOR ]]; then
63
 
    juju_local_deb="juju-local_$VERSION-0ubuntu1~$RELEASE.1~juju1_all.deb"
64
 
    $SCRIPTS/jujuci.py get assemble-streams $juju_local_deb debs
65
 
fi
 
61
$SCRIPTS/jujuci.py get assemble-streams $juju_local_deb debs
66
62
$SCRIPTS/jujuci.py get assemble-streams $juju_core_deb debs
67
63
 
68
64
scp -o 'StrictHostKeyChecking no' -o 'UserKnownHostsFile /dev/null' \
69
 
  debs/*.deb ubuntu@$instance_name:
 
65
  debs/$juju_local_deb debs/$juju_core_deb ubuntu@$instance_name:
70
66
 
71
67
set +e
72
68
ssh -o "StrictHostKeyChecking no" -o "UserKnownHostsFile /dev/null" \