X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fodl%2Ffetch-charms.sh;h=84209f42ef3f22a31a96eba5e68e8a6924b9fb92;hb=20f209a6c7564af44c12d06da92db2b55354b0b4;hp=2483fa8c37ca2624d38cc2631bdc58f2d2a296bf;hpb=f6ae2a4c44347d691b4d6c04a156b6a4e82afa25;p=joid.git

diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 2483fa8c..84209f42 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -5,37 +5,64 @@ 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
-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-mon.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:~narindergupta/charm-neutron-gateway-0 $distro/neutron-gateway
+
 git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
-build
+build congress
+
+git clone https://github.com/openstack/charm-hacluster.git $distro/hacluster
+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-mon.git $distro/ceph-mon
+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
+git clone  https://github.com/openstack/charm-lxd.git xenial/lxd
+
+charm pull cs:$distro/aodh $distro/aodh
+
+#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
-git clone https://github.com/openstack/charm-odl-controller.git $distro/odl-controller
-git clone https://github.com/openstack/charm-neutron-api-odl.git $distro/neutron-api-odl
-git clone https://github.com/openstack/charm-openvswitch-odl.git $distro/openvswitch-odl
+#odl controller specific charm
+charm pull cs:$distro/odl-controller $distro/odl-controller
+charm pull cs:$distro/neutron-api-odl $distro/neutron-api-odl
+charm pull cs:~narindergupta/openvswitch-odl-1 $distro/openvswitch-odl