openstack
/
puppet-openstack-integration
Code Issues Proposed changes

Move to opendev 

Change-Id: I467e86b132314d6bf5331ff44a254d38a84dfab0
This commit is contained in:
ZhongShengping 2019-04-21 14:44:50 +08:00
parent ddec0d411d
commit a8bf4ac2e8
5 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -7,7 +7,7 @@ group :development, :test, :system_tests do
:require => 'false' :require => 'false'
else else
gem 'puppet-openstack_spec_helper', gem 'puppet-openstack_spec_helper',
:git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper', :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
:require => 'false' :require => 'false'
end end
gem 'fast_gettext', ['< 1.2.0'] gem 'fast_gettext', ['< 1.2.0']

76
Puppetfile
View File

@ -2,155 +2,155 @@
## OpenStack modules ## OpenStack modules
mod 'aodh', mod 'aodh',
:git => 'https://git.openstack.org/openstack/puppet-aodh', :git => 'https://opendev.org/openstack/puppet-aodh',
:ref => 'master' :ref => 'master'
mod 'barbican', mod 'barbican',
:git => 'https://git.openstack.org/openstack/puppet-barbican', :git => 'https://opendev.org/openstack/puppet-barbican',
:ref => 'master' :ref => 'master'
mod 'ceilometer', mod 'ceilometer',
:git => 'https://git.openstack.org/openstack/puppet-ceilometer', :git => 'https://opendev.org/openstack/puppet-ceilometer',
:ref => 'master' :ref => 'master'
mod 'ceph', mod 'ceph',
:git => 'https://git.openstack.org/openstack/puppet-ceph', :git => 'https://opendev.org/openstack/puppet-ceph',
:ref => 'master' :ref => 'master'
mod 'cinder', mod 'cinder',
:git => 'https://git.openstack.org/openstack/puppet-cinder', :git => 'https://opendev.org/openstack/puppet-cinder',
:ref => 'master' :ref => 'master'
mod 'cloudkitty', mod 'cloudkitty',
:git => 'https://git.openstack.org/openstack/puppet-cloudkitty', :git => 'https://opendev.org/openstack/puppet-cloudkitty',
:ref => 'master' :ref => 'master'
mod 'congress', mod 'congress',
:git => 'https://git.openstack.org/openstack/puppet-congress', :git => 'https://opendev.org/openstack/puppet-congress',
:ref => 'master' :ref => 'master'
mod 'designate', mod 'designate',
:git => 'https://git.openstack.org/openstack/puppet-designate', :git => 'https://opendev.org/openstack/puppet-designate',
:ref => 'master' :ref => 'master'
mod 'ec2api', mod 'ec2api',
:git => 'https://git.openstack.org/openstack/puppet-ec2api', :git => 'https://opendev.org/openstack/puppet-ec2api',
:ref => 'master' :ref => 'master'
mod 'glance', mod 'glance',
:git => 'https://git.openstack.org/openstack/puppet-glance', :git => 'https://opendev.org/openstack/puppet-glance',
:ref => 'master' :ref => 'master'
mod 'gnocchi', mod 'gnocchi',
:git => 'https://git.openstack.org/openstack/puppet-gnocchi', :git => 'https://opendev.org/openstack/puppet-gnocchi',
:ref => 'master' :ref => 'master'
mod 'heat', mod 'heat',
:git => 'https://git.openstack.org/openstack/puppet-heat', :git => 'https://opendev.org/openstack/puppet-heat',
:ref => 'master' :ref => 'master'
mod 'horizon', mod 'horizon',
:git => 'https://git.openstack.org/openstack/puppet-horizon', :git => 'https://opendev.org/openstack/puppet-horizon',
:ref => 'master' :ref => 'master'
mod 'ironic', mod 'ironic',
:git => 'https://git.openstack.org/openstack/puppet-ironic', :git => 'https://opendev.org/openstack/puppet-ironic',
:ref => 'master' :ref => 'master'
mod 'keystone', mod 'keystone',
:git => 'https://git.openstack.org/openstack/puppet-keystone', :git => 'https://opendev.org/openstack/puppet-keystone',
:ref => 'master' :ref => 'master'
mod 'manila', mod 'manila',
:git => 'https://git.openstack.org/openstack/puppet-manila', :git => 'https://opendev.org/openstack/puppet-manila',
:ref => 'master' :ref => 'master'
mod 'mistral', mod 'mistral',
:git => 'https://git.openstack.org/openstack/puppet-mistral', :git => 'https://opendev.org/openstack/puppet-mistral',
:ref => 'master' :ref => 'master'
mod 'monasca', mod 'monasca',
:git => 'https://git.openstack.org/openstack/puppet-monasca', :git => 'https://opendev.org/openstack/puppet-monasca',
:ref => 'master' :ref => 'master'
mod 'murano', mod 'murano',
:git => 'https://git.openstack.org/openstack/puppet-murano', :git => 'https://opendev.org/openstack/puppet-murano',
:ref => 'master' :ref => 'master'
mod 'neutron', mod 'neutron',
:git => 'https://git.openstack.org/openstack/puppet-neutron', :git => 'https://opendev.org/openstack/puppet-neutron',
:ref => 'master' :ref => 'master'
mod 'nova', mod 'nova',
:git => 'https://git.openstack.org/openstack/puppet-nova', :git => 'https://opendev.org/openstack/puppet-nova',
:ref => 'master' :ref => 'master'
mod 'octavia', mod 'octavia',
:git => 'https://git.openstack.org/openstack/puppet-octavia', :git => 'https://opendev.org/openstack/puppet-octavia',
:ref => 'master' :ref => 'master'
mod 'openstack_extras', mod 'openstack_extras',
:git => 'https://git.openstack.org/openstack/puppet-openstack_extras', :git => 'https://opendev.org/openstack/puppet-openstack_extras',
:ref => 'master' :ref => 'master'
mod 'openstacklib', mod 'openstacklib',
:git => 'https://git.openstack.org/openstack/puppet-openstacklib', :git => 'https://opendev.org/openstack/puppet-openstacklib',
:ref => 'master' :ref => 'master'
mod 'oslo', mod 'oslo',
:git => 'https://git.openstack.org/openstack/puppet-oslo', :git => 'https://opendev.org/openstack/puppet-oslo',
:ref => 'master' :ref => 'master'
mod 'ovn', mod 'ovn',
:git => 'https://git.openstack.org/openstack/puppet-ovn', :git => 'https://opendev.org/openstack/puppet-ovn',
:ref => 'master' :ref => 'master'
mod 'panko', mod 'panko',
:git => 'https://git.openstack.org/openstack/puppet-panko', :git => 'https://opendev.org/openstack/puppet-panko',
:ref => 'master' :ref => 'master'
mod 'placement', mod 'placement',
:git => 'https://git.openstack.org/openstack/puppet-placement', :git => 'https://opendev.org/openstack/puppet-placement',
:ref => 'master' :ref => 'master'
mod 'qdr', mod 'qdr',
:git => 'https://git.openstack.org/openstack/puppet-qdr', :git => 'https://opendev.org/openstack/puppet-qdr',
:ref => 'master' :ref => 'master'
mod 'sahara', mod 'sahara',
:git => 'https://git.openstack.org/openstack/puppet-sahara', :git => 'https://opendev.org/openstack/puppet-sahara',
:ref => 'master' :ref => 'master'
mod 'swift', mod 'swift',
:git => 'https://git.openstack.org/openstack/puppet-swift', :git => 'https://opendev.org/openstack/puppet-swift',
:ref => 'master' :ref => 'master'
mod 'tacker', mod 'tacker',
:git => 'https://git.openstack.org/openstack/puppet-tacker', :git => 'https://opendev.org/openstack/puppet-tacker',
:ref => 'master' :ref => 'master'
mod 'tempest', mod 'tempest',
:git => 'https://git.openstack.org/openstack/puppet-tempest', :git => 'https://opendev.org/openstack/puppet-tempest',
:ref => 'master' :ref => 'master'
mod 'trove', mod 'trove',
:git => 'https://git.openstack.org/openstack/puppet-trove', :git => 'https://opendev.org/openstack/puppet-trove',
:ref => 'master' :ref => 'master'
mod 'vswitch', mod 'vswitch',
:git => 'https://git.openstack.org/openstack/puppet-vswitch', :git => 'https://opendev.org/openstack/puppet-vswitch',
:ref => 'master' :ref => 'master'
mod 'vitrage', mod 'vitrage',
:git => 'https://git.openstack.org/openstack/puppet-vitrage', :git => 'https://opendev.org/openstack/puppet-vitrage',
:ref => 'master' :ref => 'master'
mod 'watcher', mod 'watcher',
:git => 'https://git.openstack.org/openstack/puppet-watcher', :git => 'https://opendev.org/openstack/puppet-watcher',
:ref => 'master' :ref => 'master'
mod 'zaqar', mod 'zaqar',
:git => 'https://git.openstack.org/openstack/puppet-zaqar', :git => 'https://opendev.org/openstack/puppet-zaqar',
:ref => 'master' :ref => 'master'
## External modules ## External modules

2
all-in-one.sh
View File

@ -23,7 +23,7 @@
# * At least 10GB of storage # * At least 10GB of storage
# #
# Usage: # Usage:
# $ git clone https://git.openstack.org/openstack/puppet-openstack-integration # $ git clone https://opendev.org/openstack/puppet-openstack-integration
# $ cd puppet-openstack-integration # $ cd puppet-openstack-integration
# $ ./all-in-one.sh # $ ./all-in-one.sh
# #

2
functions
View File

@ -44,7 +44,7 @@ EOF
/usr/zuul-env/bin/zuul-cloner -m clonemap.yaml \ /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml \
--cache-dir /opt/git \ --cache-dir /opt/git \
--zuul-branch $ZUUL_BRANCH \ --zuul-branch $ZUUL_BRANCH \
https://git.openstack.org $project_names https://opendev.org $project_names
# Because openstack-integration can't be a class name. # Because openstack-integration can't be a class name.
# https://projects.puppetlabs.com/issues/5268 # https://projects.puppetlabs.com/issues/5268

10
run_tests.sh
View File

@ -112,11 +112,11 @@ if [ -e /usr/zuul-env/bin/zuul-cloner ] ; then
# For ubuntu we always need to deploy tempest-horizon from source # For ubuntu we always need to deploy tempest-horizon from source
if uses_debs; then if uses_debs; then
/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
https://git.openstack.org openstack/tempest-horizon https://opendev.org openstack/tempest-horizon
fi fi
if [ "${TEMPEST_FROM_SOURCE}" = true ]; then if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
/usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \ /usr/zuul-env/bin/zuul-cloner --workspace /tmp --cache-dir /opt/git \
https://git.openstack.org openstack/tempest https://opendev.org openstack/tempest
# Pin Tempest to TEMPEST_VERSION unless we're running inside the # Pin Tempest to TEMPEST_VERSION unless we're running inside the
# openstack/tempest gate. # openstack/tempest gate.
if [[ "${ZUUL_PROJECT}" != "openstack/tempest" ]]; then if [[ "${ZUUL_PROJECT}" != "openstack/tempest" ]]; then
@ -129,11 +129,11 @@ else
# For ubuntu we always need to deploy tempest-horizon from source # For ubuntu we always need to deploy tempest-horizon from source
if uses_debs; then if uses_debs; then
$SUDO rm -rf /tmp/openstack/tempest-horizon $SUDO rm -rf /tmp/openstack/tempest-horizon
git clone https://git.openstack.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon git clone https://opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
fi fi
if [ "${TEMPEST_FROM_SOURCE}" = true ]; then if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
$SUDO rm -rf /tmp/openstack/tempest $SUDO rm -rf /tmp/openstack/tempest
git clone https://git.openstack.org/openstack/tempest /tmp/openstack/tempest git clone https://opendev.org/openstack/tempest /tmp/openstack/tempest
pushd /tmp/openstack/tempest pushd /tmp/openstack/tempest
git reset --hard origin/$TEMPEST_VERSION git reset --hard origin/$TEMPEST_VERSION
popd popd
@ -348,7 +348,7 @@ cd /tmp/openstack/tempest
if [ "${TEMPEST_FROM_SOURCE}" = true ]; then if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
virtualenv --system-site-packages run_tempest virtualenv --system-site-packages run_tempest
run_tempest/bin/pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt -U -r requirements.txt run_tempest/bin/pip install -c https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt -U -r requirements.txt
run_tempest/bin/python setup.py install run_tempest/bin/python setup.py install
run_tempest/bin/stestr init run_tempest/bin/stestr init
export tempest_binary="run_tempest/bin/tempest" export tempest_binary="run_tempest/bin/tempest"