From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Fri, 10 Jun 2016 15:31:26 +0000 (-0500)
Subject: added congress integration with odl,onos and opencontrail
X-Git-Tag: colorado.1.0~142
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F15383%2F1;p=joid.git

added congress integration with odl,onos and opencontrail

Change-Id: Ideb9c4ca730349e942f562413e7f918f1fa413f9
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index b9e30e3b..95f92c47 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -3,6 +3,12 @@
 distro=$1
 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
+}
+
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
@@ -26,9 +32,10 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu
 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/gnuoy/charm-congress.git $distro/charm-congress
+build
 
 #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
-
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index f447fff5..af56c403 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -3,6 +3,12 @@
 distro=$1
 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
+}
+
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
@@ -25,6 +31,8 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu
 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/gnuoy/charm-congress.git $distro/charm-congress
+build
 
 # Controller specific charm
 bzr branch lp:~wuwenbin2/onosfw/onos-controller $distro/onos-controller
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index c64eb4a5..b6efd316 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -4,6 +4,12 @@ distro=$1
 mkdir precise
 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
+}
+
 # openstack
 bzr branch lp:~narindergupta/charms/trusty/promise/trunk $distro/promise
 bzr branch lp:~billy-olsen/charms/xenial/mongodb/trunk $distro/mongodb
@@ -28,6 +34,8 @@ git clone https://github.com/openstack/charm-nova-compute.git $distro/nova-compu
 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/gnuoy/charm-congress.git $distro/charm-congress
+build
 
 # Controller specific charm
 bzr branch lp:~sdn-charmers/charms/$distro/keepalived/trunk $distro/keepalived