From: Narinder Gupta Date: Fri, 16 Dec 2016 09:11:28 +0000 (-0600) Subject: modified to use the stable branch for newton. X-Git-Tag: danube.1.0~104 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F89%2F26089%2F2;p=joid.git modified to use the stable branch for newton. Change-Id: Ib79fdad42b176cfb1576acbf5a36d44cbe855abc Signed-off-by: Narinder Gupta --- diff --git a/ci/nosdn/fetch-charms.sh b/ci/nosdn/fetch-charms.sh index afa122e3..661b0dee 100755 --- a/ci/nosdn/fetch-charms.sh +++ b/ci/nosdn/fetch-charms.sh @@ -17,26 +17,26 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress 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 -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 +git clone -b stable/16.10 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/16.10 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/16.10 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/16.10 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/16.10 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/16.10 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/16.10 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/16.10 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/16.10 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/16.10 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/16.10 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/16.10 https://github.com/openstack/charm-lxd.git xenial/lxd charm pull cs:$distro/aodh $distro/aodh charm pull cs:~free.ekanayaka/xenial/haproxy-1 $distro/haproxy diff --git a/ci/odl/fetch-charms.sh b/ci/odl/fetch-charms.sh index c77df379..b38c6cec 100755 --- a/ci/odl/fetch-charms.sh +++ b/ci/odl/fetch-charms.sh @@ -17,26 +17,26 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress 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 -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 +git clone -b stable/16.10 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/16.10 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/16.10 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/16.10 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/16.10 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/16.10 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/16.10 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/16.10 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/16.10 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/16.10 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/16.10 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/16.10 https://github.com/openstack/charm-lxd.git xenial/lxd charm pull cs:$distro/aodh $distro/aodh diff --git a/ci/onos/fetch-charms.sh b/ci/onos/fetch-charms.sh index 367c8cd0..5b7c05a0 100755 --- a/ci/onos/fetch-charms.sh +++ b/ci/onos/fetch-charms.sh @@ -17,25 +17,25 @@ bzr branch lp:~narindergupta/opnfv/ntp $distro/ntp git clone https://github.com/gnuoy/charm-congress.git $distro/charm-congress 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 -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-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 $distro/lxd +git clone -b stable/16.10 https://github.com/openstack/charm-hacluster.git $distro/hacluster +git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/16.10 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/16.10 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/16.10 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/16.10 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/16.10 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-api.git $distro/neutron-api +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/16.10 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/16.10 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/16.10 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/16.10 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/16.10 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/16.10 https://github.com/openstack/charm-lxd.git $distro/lxd charm pull cs:$distro/aodh $distro/aodh diff --git a/ci/opencontrail/fetch-charms.sh b/ci/opencontrail/fetch-charms.sh index e1504949..e8088af4 100755 --- a/ci/opencontrail/fetch-charms.sh +++ b/ci/opencontrail/fetch-charms.sh @@ -20,26 +20,26 @@ 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 +git clone -b stable/16.10 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-mon.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 +#git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer.git $distro/ceilometer +#git clone -b stable/16.10 https://github.com/openstack/charm-ceilometer-agent.git $distro/ceilometer-agent +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-mon.git $distro/ceph +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-osd.git $distro/ceph-osd +git clone -b stable/16.10 https://github.com/openstack/charm-ceph-radosgw.git $distro/ceph-radosgw +git clone -b stable/16.10 https://github.com/openstack/charm-cinder.git $distro/cinder +git clone -b stable/16.10 https://github.com/openstack/charm-cinder-ceph.git $distro/cinder-ceph +git clone -b stable/16.10 https://github.com/openstack/charm-glance.git $distro/glance +git clone -b stable/16.10 https://github.com/openstack/charm-keystone.git $distro/keystone +git clone -b stable/16.10 https://github.com/openstack/charm-percona-cluster.git $distro/percona-cluster +git clone -b stable/16.10 https://github.com/openstack/charm-neutron-gateway.git $distro/neutron-gateway +#git clone -b stable/16.10 https://github.com/openstack/charm-neutron-openvswitch.git $distro/neutron-openvswitch +git clone -b stable/16.10 https://github.com/openstack/charm-nova-cloud-controller.git $distro/nova-cloud-controller +git clone -b stable/16.10 https://github.com/openstack/charm-nova-compute.git $distro/nova-compute +git clone -b stable/16.10 https://github.com/openstack/charm-openstack-dashboard.git $distro/openstack-dashboard +git clone -b stable/16.10 https://github.com/openstack/charm-rabbitmq-server.git $distro/rabbitmq-server +git clone -b stable/16.10 https://github.com/openstack/charm-heat.git $distro/heat +git clone -b stable/16.10 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