X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopencontrail%2Ffetch-charms.sh;h=908f7c114e11ca801bb7a07b58d1ea13ea69fbc6;hb=9510c5939f4a30b79d6104ea5b05af42a1ea446a;hp=911dc55dbf70e5c1e87b47dac1306c2b47254b65;hpb=4721b062c4ac0fe8030407948b856661beb8ed46;p=joid.git

diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 911dc55d..908f7c11 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -1,27 +1,70 @@
-#!/bin/sh -ex
+#!/bin/bash -ex
 
-mkdir -p src/charms/trusty src/charms/precise
+distro=$1
+mkdir precise
+mkdir -p $distro
+
+function build {
+    sudo apt-get install charm-tools -y
+    (cd $distro/charm-$1; charm build -s $distro  -obuild src)
+    mv $distro/charm-$1/build/$distro/$1 $distro
+}
 
 # openstack
-bzr branch lp:~openstack-charmers/charms/trusty/glance/next src/charms/trusty/glance-next
-bzr branch lp:~openstack-charmers/charms/trusty/keystone/next src/charms/trusty/keystone-next
-bzr branch lp:~openstack-charmers/charms/trusty/neutron-api/vpp src/charms/trusty/neutron-api-vpp
-bzr branch lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next src/charms/trusty/nova-cloud-controller-next
-bzr branch lp:~openstack-charmers/charms/trusty/nova-compute/next src/charms/trusty/nova-compute-next
-bzr branch lp:~openstack-charmers/charms/trusty/openstack-dashboard/next src/charms/trusty/openstack-dashboard-next
-bzr branch lp:~sdn-charmers/charms/trusty/quantum-gateway/contrail src/charms/trusty/quantum-gateway-contrail
+bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
+charm pull cs:trusty/mongodb $distro/mongodb
+charm pull cs:$distro/haproxy $distro/haproxy
+charm pull cs:$distro/ntp $distro/ntp
+charm pull cs:$distro/aodh $distro/aodh
+
+git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress
+build congress
+
+git clone -b stable/16.07 https://github.com/openstack/charm-hacluster.git $distro/hacluster
+#bzr branch lp:~sdn-charmers/charms/$distro/ceilometer/ceilometer-plugin $distro/ceilometer
+#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
 
-# contrail
-bzr branch lp:~sdn-charmers/charms/precise/cassandra/forced-install src/charms/precise/cassandra-forced-install
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-analytics/trunk src/charms/trusty/contrail-analytics
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-configuration/trunk src/charms/trusty/contrail-configuration
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-control/trunk src/charms/trusty/contrail-control
-bzr branch lp:~sdn-charmers/charms/trusty/contrail-webui/trunk src/charms/trusty/contrail-webui
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-api-contrail/trunk src/charms/trusty/neutron-api-contrail
-bzr branch lp:~sdn-charmers/charms/trusty/neutron-contrail/trunk src/charms/trusty/neutron-contrail
-bzr branch lp:~sdn-charmers/charms/precise/zookeeper/fix-symlink src/charms/precise/zookeeper-fix-symlink
+#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
 
-mkdir -p charms/trusty charms/precise
-(cd charms/trusty; ln -s ../../src/charms/trusty/* .)
-# symlink trusty charms to precise
-(cd charms/precise; ln -s ../../src/charms/trusty/* .; ln -s ../../src/charms/precise/* .)
+# Controller specific charm
+git clone https://git.opnfv.org/ovno.git
+cd ovno/charms/trusty
+mv * ../../../$distro/
+cd ../../../
+rm -rf ovno