X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopencontrail%2Ffetch-charms.sh;h=9ba9bc6e4ad2f84ed5a9f21bd289811038eb447b;hb=92c484d833198b037e631416b23e9ee9fe42ff25;hp=c46fee21d039c7baa01b112657b7cea903d19ed6;hpb=6c6b89e19aaa261f390e9c0fb096381378d99eb7;p=joid.git

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index c46fee21..9ba9bc6e 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -6,44 +6,69 @@ mkdir -p $distro
 
 function build {
     sudo apt-get install charm-tools -y
-    (cd $distro/charm-congress; charm build -s $distro  -obuild src)
-    mv $distro/charm-congress/build/$distro/congress $distro
+    (cd $distro/charm-$1; charm build -s $distro  -obuild src)
+    mv $distro/charm-$1/build/$distro/$1 $distro
 }
 
 # 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
-bzr branch lp:~openstack-charmers/charms/trusty/hacluster/next $distro/hacluster
-bzr branch lp:~opnfv-team/charms/trusty/haproxy/trunk $distro/haproxy
-git clone https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
-git clone https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
-git clone https://github.com/openstack/charm-ceph.git $distro/ceph
-git clone https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
-git clone https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
-git clone https://github.com/openstack/charm-cinder.git $distro/cinder
-git clone https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
-git clone https://github.com/openstack/charm-glance.git $distro/glance
-git clone https://github.com/openstack/charm-keystone.git $distro/keystone
-git clone https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
-git clone https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
-git clone https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
-git clone https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
-git clone https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
-git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
-git clone https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
-git clone https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
-git clone https://github.com/openstack/charm-heat.git $distro/heat
+charm pull cs:~free.ekanayaka/xenial/haproxy xenial/haproxy
+
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
-build
+build congress
+git clone -b stable/16.07 https://github.com/openstack/charm-aodh.git $distro/charm-aodh
+build aodh
+
+git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer
+git clone -b stable/16.07 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph.git $distro/ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd
+git clone -b stable/16.07 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder.git $distro/cinder
+git clone -b stable/16.07 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph
+git clone -b stable/16.07 https://github.com/openstack/charm-glance.git $distro/glance
+git clone -b stable/16.07 https://github.com/openstack/charm-keystone.git $distro/keystone
+git clone -b stable/16.07 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller
+git clone -b stable/16.07 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute
+git clone -b stable/16.07 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard
+git clone -b stable/16.07 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server
+git clone -b stable/16.07 https://github.com/openstack/charm-heat.git $distro/heat
+git clone -b stable/16.07 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api
+
+#charm pull cs:~openstack-charmers-next/hacluster $distro/hacluster
+#charm pull cs:~openstack-charmers-next/ceilometer $distro/ceilometer
+#charm pull cs:~openstack-charmers-next/ceilometer-agent $distro/ceilometer-agent
+#charm pull cs:~openstack-charmers-next/ceph-mon $distro/ceph
+#charm pull cs:~openstack-charmers-next/ceph-osd $distro/ceph-osd
+#charm pull cs:~openstack-charmers-next/ceph-radosgw $distro/ceph-radosgw
+#charm pull cs:~openstack-charmers-next/cinder $distro/cinder
+#charm pull cs:~openstack-charmers-next/cinder-ceph $distro/cinder-ceph
+#charm pull cs:~openstack-charmers-next/glance $distro/glance
+#charm pull cs:~openstack-charmers-next/keystone $distro/keystone
+#charm pull cs:~openstack-charmers-next/percona-cluster $distro/percona-cluster
+#charm pull cs:~openstack-charmers-next/neutron-api $distro/neutron-api
+#charm pull cs:~openstack-charmers-next/neutron-gateway $distro/neutron-gateway
+#charm pull cs:~openstack-charmers-next/neutron-openvswitch $distro/neutron-openvswitch
+#charm pull cs:~openstack-charmers-next/nova-cloud-controller $distro/nova-cloud-controller
+#charm pull cs:~openstack-charmers-next/nova-compute $distro/nova-compute
+#charm pull cs:~openstack-charmers-next/openstack-dashboard $distro/openstack-dashboard
+#charm pull cs:~openstack-charmers-next/rabbitmq-server $distro/rabbitmq-server
+#charm pull cs:~openstack-charmers-next/heat $distro/heat
+#charm pull cs:~openstack-charmers-next/lxd xenial/lxd
 
 # Controller specific charm
-bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived
-bzr branch lp:~stub/charms/$distro/cassandra/noauthentication $distro/cassandra-noauthentication
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-analytics/trunk $distro/contrail-analytics
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-configuration/trunk $distro/contrail-configuration
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-control/trunk $distro/contrail-control
-bzr branch lp:~sdn-charmers/charms/$distro/contrail-webui/trunk $distro/contrail-webui
+bzr branch lp:~sdn-charmers/charms/trusty/keepalived/trunk $distro/keepalived
+bzr branch lp:~stub/charms/trusty/cassandra/noauthentication $distro/cassandra
+bzr branch lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk $distro/contrail-analytics
+bzr branch lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk $distro/contrail-configuration
+bzr branch lp:~sdn-charmers/charms/trusty/contrail-control/trunk $distro/contrail-control
+bzr branch lp:~sdn-charmers/charms/trusty/contrail-webui/trunk $distro/contrail-webui
 bzr branch lp:~charmers/charms/precise/zookeeper/trunk precise/zookeeper
-bzr branch lp:~opnfv-team/charms/$distro/neutron-api-contrail/trunk $distro/neutron-api-contrail
-bzr branch lp:~opnfv-team/charms/$distro/neutron-contrail/trunk $distro/neutron-contrail
+bzr branch lp:~opnfv-team/charms/trusty/neutron-api-contrail/trunk $distro/neutron-api-contrail
+bzr branch lp:~opnfv-team/charms/trusty/neutron-contrail/trunk $distro/neutron-contrail