From 9186c816d279c47a6a89abc9e587128c41bdd08f Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Fri, 1 Dec 2017 16:29:29 +0000 Subject: [PATCH] Revert "adding latest release charm support." This reverts commit 9f0a678ee9d4a5a0afc620f93edb14b3e4dcf56b. Change-Id: I1671d69dfcd8ebd3dd60a495de5d8cdca65ab1a2 Signed-off-by: Narinder Gupta --- ci/03-maasdeploy.sh | 24 +++------------------ ci/kubernetes/fetch-charms.sh | 6 +++--- ci/nosdn/fetch-charms.sh | 42 ++++++++++++++++++------------------ ci/odl/fetch-charms.sh | 48 ++++++++++++++++++++--------------------- ci/onos/fetch-charms.sh | 38 ++++++++++++++++---------------- ci/opencontrail/fetch-charms.sh | 42 ++++++++++++++++++------------------ 6 files changed, 91 insertions(+), 109 deletions(-) diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index 934c8cc1..005be470 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -21,7 +21,6 @@ then usage; fi -opnfvdistro=`cat /etc/lsb-release | grep CODENAME | cut -d "=" -f 2` virtinstall=0 labname=$1 @@ -51,34 +50,17 @@ 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 -if [ "bionic" == "$opnfvdistro" ]; then - echo "no cloud archive needed" -else - sudo apt-add-repository cloud-archive:pike -y -fi - +sudo apt-add-repository cloud-archive:pike -y if [ "aarch64" == "$NODE_ARCTYPE" ]; then - if [ "bionic" == "$opnfvdistro" ]; then - echo "no repository needed" - else - sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y - fi +sudo add-apt-repository ppa:ubuntu-cloud-archive/pike-staging -y fi sudo apt-get update -y || true #sudo apt-get dist-upgrade -y -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 \ +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 diff --git a/ci/kubernetes/fetch-charms.sh b/ci/kubernetes/fetch-charms.sh index ee89d8f6..fd784ba1 100755 --- a/ci/kubernetes/fetch-charms.sh +++ b/ci/kubernetes/fetch-charms.sh @@ -10,7 +10,7 @@ function build { } # openstack -charm pull cs:ntp $distro/ntp -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index 7ada1697..48feb590 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -12,31 +12,31 @@ function build { # openstack bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise -git clone -b stable/17.11 https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -git clone -b stable/17.11 https://github.com/openstack/charm-cinder.git $distro/cinder -git clone -b stable/17.11 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph -git clone -b stable/17.11 https://github.com/openstack/charm-glance.git $distro/glance -git clone -b stable/17.11 https://github.com/openstack/charm-keystone.git $distro/keystone -git clone -b stable/17.11 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone -b stable/17.11 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone -b stable/17.11 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone -b stable/17.11 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone -b stable/17.11 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.11 https://github.com/openstack/charm-heat.git $distro/heat -git clone -b stable/17.11 https://github.com/openstack/charm-lxd.git $distro/lxd +git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton charm pull cs:$distro/aodh $distro/aodh charm pull cs:$distro/mongodb $distro/mongodb -charm pull cs:ntp $distro/ntp +charm pull cs:$distro/ntp $distro/ntp charm pull cs:$distro/haproxy $distro/haproxy charm pull cs:~narindergupta/congress-1 $distro/congress diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index cf8c6dc8..9b7adaed 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -12,34 +12,34 @@ function build { # openstack bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise -git clone -b stable/17.11 https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -git clone -b stable/17.11 https://github.com/openstack/charm-cinder.git $distro/cinder -git clone -b stable/17.11 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph -git clone -b stable/17.11 https://github.com/openstack/charm-glance.git $distro/glance -git clone -b stable/17.11 https://github.com/openstack/charm-keystone.git $distro/keystone -git clone -b stable/17.11 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone -b stable/17.11 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone -b stable/17.11 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone -b stable/17.11 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone -b stable/17.11 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.11 https://github.com/openstack/charm-heat.git $distro/heat -git clone -b stable/17.11 https://github.com/openstack/charm-lxd.git $distro/lxd -git clone -b stable/17.11 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl -git clone -b stable/17.11 https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl +git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd +git clone -b stable/17.08 https://github.com/openstack/charm-odl-controller.git $distro/odl-controller +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl +git clone -b stable/17.08 https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl git clone https://github.com/openbaton/juju-charm.git $distro/openbaton charm pull cs:$distro/aodh $distro/aodh charm pull cs:$distro/mongodb $distro/mongodb -charm pull cs:ntp $distro/ntp +charm pull cs:$distro/ntp $distro/ntp #pulling scaleio charms. charm pull cs:~cloudscaling/scaleio-mdm $distro/scaleio-mdm diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index fc093cdb..3ffc628f 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -12,29 +12,29 @@ function build { # openstack bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb +bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp -git clone -b stable/17.11 https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -git clone -b stable/17.11 https://github.com/openstack/charm-cinder.git $distro/cinder -git clone -b stable/17.11 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph -git clone -b stable/17.11 https://github.com/openstack/charm-glance.git $distro/glance -git clone -b stable/17.11 https://github.com/openstack/charm-keystone.git $distro/keystone -git clone -b stable/17.11 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone -b stable/17.11 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone -b stable/17.11 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone -b stable/17.11 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone -b stable/17.11 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.11 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat git clone https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton -charm pull cs:ntp $distro/ntp charm pull cs:$distro/aodh $distro/aodh charm pull cs:~narindergupta/congress-1 $distro/congress diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index ef967c56..2a88ba63 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -12,30 +12,30 @@ function build { # openstack bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise -git clone -b stable/17.11 https://github.com/openstack/charm-hacluster.git $distro/hacluster -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer -git clone -b stable/17.11 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd -git clone -b stable/17.11 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw -git clone -b stable/17.11 https://github.com/openstack/charm-cinder.git $distro/cinder -git clone -b stable/17.11 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph -git clone -b stable/17.11 https://github.com/openstack/charm-glance.git $distro/glance -git clone -b stable/17.11 https://github.com/openstack/charm-keystone.git $distro/keystone -git clone -b stable/17.11 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway -git clone -b stable/17.11 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch -git clone -b stable/17.11 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller -git clone -b stable/17.11 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute -git clone -b stable/17.11 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard -git clone -b stable/17.11 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server -git clone -b stable/17.11 https://github.com/openstack/charm-heat.git $distro/heat -git clone -b stable/17.11 https://github.com/openstack/charm-lxd.git $distro/lxd +git clone -b stable/17.08 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/17.08 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-mon.git $distro/ceph-mon +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/17.08 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/17.08 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/17.08 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/17.08 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/17.08 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/17.08 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/17.08 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/17.08 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/17.08 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/17.08 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/17.08 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/17.08 https://github.com/openstack/charm-lxd.git $distro/lxd git clone https://github.com/openbaton/juju-charm.git $distro/openbaton charm pull cs:$distro/mongodb $distro/mongodb -charm pull cs:ntp $distro/ntp +charm pull cs:$distro/ntp $distro/ntp charm pull cs:$distro/aodh $distro/aodh charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy charm pull cs:~narindergupta/congress-1 $distro/congress -- 2.16.6