diff options
| author |   Narinder Gupta <narinder.gupta@canonical.com> | 2017-12-01 16:20:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-01 16:20:03 +0000 |
| commit | 905cbf68be10940e56ae5508f1f605a3994cd593 (patch) | |
| tree | 1cb4ded590361a3b79fed53ef416761d2ba251eb /ci/03-maasdeploy.sh | |
| parent | 27597328935fff61ec826b698cca2c03c05a014c (diff) | |
| parent | 9f0a678ee9d4a5a0afc620f93edb14b3e4dcf56b (diff) | |
Merge "adding latest release charm support."
Diffstat (limited to 'ci/03-maasdeploy.sh')
| -rwxr-xr-x | ci/03-maasdeploy.sh | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 005be470..934c8cc1 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -21,6 +21,7 @@ then usage; fi +opnfvdistro=`cat /etc/lsb-release | grep CODENAME | cut -d "=" -f 2` virtinstall=0 labname=$1 @@ -50,17 +51,34 @@ sudo apt-get update -y || true sudo apt-get install software-properties-common -y sudo apt-add-repository ppa:juju/stable -y sudo apt-add-repository ppa:maas/stable -y -sudo apt-add-repository cloud-archive:pike -y +if [ "bionic" == "$opnfvdistro" ]; then + echo "no cloud archive needed" +else + sudo apt-add-repository cloud-archive:pike -y +fi + if [ "aarch64" == "$NODE_ARCTYPE" ]; then -sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y + if [ "bionic" == "$opnfvdistro" ]; then + echo "no repository needed" + else + sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y + fi fi sudo apt-get update -y || true #sudo apt-get dist-upgrade -y -sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \ +if [ "bionic" == "$opnfvdistro" ]; then + sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \ + maas maas-region-controller juju python-pip python-psutil python-openstackclient \ + python-congressclient gsutil pastebinit python-jinja2 sshpass \ + openssh-server vlan ipmitool jq expect snap -y --allow-unauthenticated + sudo snap install charm +else + sudo apt-get install bridge-utils openssh-server bzr git virtinst qemu-kvm libvirt-bin \ maas maas-region-controller juju python-pip python-psutil python-openstackclient \ python-congressclient gsutil charm-tools pastebinit python-jinja2 sshpass \ openssh-server vlan ipmitool jq expect snap -y --allow-unauthenticated +fi if [ "aarch64" == "$NODE_ARCTYPE" ]; then sudo apt-get install qemu qemu-efi qemu-system-aarch64 -y --allow-unauthenticated |