summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2017-09-21 09:21:10 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-21 09:21:10 +0000
commit459a7f181f9ebb54bae36ed8ff2f9ee9560969d3 (patch)
tree07a2fa69b6d54a6cd678fd8c5bfd2e206d67163a
parent3c64cb8ab8a0aa1ae03dfe43f4759100e3650b83 (diff)
parent406b485a394ad2f1231a7c37ae781d7e005cb5d9 (diff)
Merge "Revert "pull in heat bug fix.""
-rwxr-xr-xci/nosdn/fetch-charms.sh3
-rwxr-xr-xci/odl/fetch-charms.sh3
-rwxr-xr-xci/onos/fetch-charms.sh3
-rwxr-xr-xci/opencontrail/fetch-charms.sh3
4 files changed, 0 insertions, 12 deletions
diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh
index 93dd7e3e..48feb590 100755
--- a/ci/nosdn/fetch-charms.sh
+++ b/ci/nosdn/fetch-charms.sh
@@ -31,9 +31,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
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
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
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
diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh
index 565d48ee..9b7adaed 100755
--- a/ci/odl/fetch-charms.sh
+++ b/ci/odl/fetch-charms.sh
@@ -31,9 +31,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
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
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
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
diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh
index cfe4f14b..3ffc628f 100755
--- a/ci/onos/fetch-charms.sh
+++ b/ci/onos/fetch-charms.sh
@@ -32,9 +32,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
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
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
git clone https://github.com/openstack/charm-lxd.git $distro/lxd
git clone https://github.com/openbaton/juju-charm.git $distro/openbaton
diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh
index 7eb9bdfd..2a88ba63 100755
--- a/ci/opencontrail/fetch-charms.sh
+++ b/ci/opencontrail/fetch-charms.sh
@@ -31,9 +31,6 @@ git clone -b stable/17.08 https://github.com/openstack/charm-nova-compute.git $d
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
-cd $distro/heat
-git pull https://git.openstack.org/openstack/charm-heat refs/changes/19/504219/1
-cd ../../
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