openstack/trove
Code Issues Proposed changes

Use opendev.org instead of git.openstack.org

Browse Source 
After moving to opendev.org, the following command fails when building
the Trove guest image:

curl -o /opt/stack/devstack/upper-constraints.txt \
  'https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master'

https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt
should be used instead.

Other places using git.openstack.org are also changed.

Change-Id: Id357dd61e229e3336219723c1c1ae6b50e983f26
This commit is contained in:
Lingxian Kong 2019-04-21 23:55:38 +12:00
parent 13711bd589
commit eafd303e0a
6 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/install/common_configure.txt
View File

@ -29,7 +29,7 @@
3. Verify that the ``api-paste.ini`` file is present in ``/etc/trove``. 3. Verify that the ``api-paste.ini`` file is present in ``/etc/trove``.
If the file is not present, you can get it from this If the file is not present, you can get it from this
`location <http://git.openstack.org/cgit/openstack/trove/plain/etc/trove/api-paste.ini>`__. `location <https://opendev.org/openstack/trove/raw/branch/master/etc/trove/api-paste.ini>`__.
4. Edit the ``trove.conf`` file so it includes appropriate values for the 4. Edit the ``trove.conf`` file so it includes appropriate values for the
settings shown below: settings shown below:

6
integration/scripts/files/elements/fedora-guest/extra-data.d/15-trove-dep
View File

@ -9,7 +9,6 @@ set -o xtrace
source $_LIB/die source $_LIB/die
BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default} BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default}
ADD_BRANCH=$(basename ${BRANCH_OVERRIDE})
REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/files/requirements/fedora-requirements.txt REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/files/requirements/fedora-requirements.txt
[ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set" [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
@ -32,13 +31,12 @@ if [ -f "${DEST}/requirements/${UC_FILE}" ]; then
else else
UC_DIR=$(pwd) UC_DIR=$(pwd)
UC_BRANCH=${BRANCH_OVERRIDE} UC_BRANCH=${BRANCH_OVERRIDE}
if [ "${ADD_BRANCH}" == "default" ]; then if [[ "${UC_BRANCH}" == "default" ]]; then
UC_BRANCH=master UC_BRANCH=master
fi fi
set +e set +e
curl -o "${UC_DIR}/${UC_FILE}" \ curl -o "${UC_DIR}/${UC_FILE}" "https://opendev.org/openstack/requirements/raw/branch/${UC_BRANCH}/${UC_FILE}"
https://git.openstack.org/cgit/openstack/requirements/plain/${UC_FILE}?h=${UC_BRANCH}
set -e set -e
if [ -f "${UC_DIR}/${UC_FILE}" ]; then if [ -f "${UC_DIR}/${UC_FILE}" ]; then

4
integration/scripts/files/elements/guest-agent/source-repository-guest-agent
View File

@ -1,3 +1,3 @@
# This is used for source-based builds # This is used for source-based builds
guest-agent git /opt/guest-agent https://git.openstack.org/openstack/trove guest-agent git /opt/guest-agent https://opendev.org/openstack/trove
upper-constraints file /opt/upper-constraints.txt https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt upper-constraints file /opt/upper-constraints.txt https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt

6
integration/scripts/files/elements/ubuntu-guest/extra-data.d/15-trove-dep
View File

@ -9,7 +9,6 @@ set -o xtrace
source $_LIB/die source $_LIB/die
BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default} BRANCH_OVERRIDE=${BRANCH_OVERRIDE:-default}
ADD_BRANCH=$(basename ${BRANCH_OVERRIDE})
REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/../../requirements.txt REQUIREMENTS_FILE=${TROVESTACK_SCRIPTS}/../../requirements.txt
[ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set" [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
@ -32,13 +31,12 @@ if [ -f "${DEST}/requirements/${UC_FILE}" ]; then
else else
UC_DIR=$(pwd) UC_DIR=$(pwd)
UC_BRANCH=${BRANCH_OVERRIDE} UC_BRANCH=${BRANCH_OVERRIDE}
if [ "${ADD_BRANCH}" == "default" ]; then if [ "${UC_BRANCH}" == "default" ]; then
UC_BRANCH=master UC_BRANCH=master
fi fi
set +e set +e
curl -o "${UC_DIR}/${UC_FILE}" \ curl -o "${UC_DIR}/${UC_FILE}" "https://opendev.org/openstack/requirements/raw/branch/${UC_BRANCH}/${UC_FILE}"
https://git.openstack.org/cgit/openstack/requirements/plain/${UC_FILE}?h=${UC_BRANCH}
set -e set -e
if [ -f "${UC_DIR}/${UC_FILE}" ]; then if [ -f "${UC_DIR}/${UC_FILE}" ]; then

2
integration/scripts/trovestack.rc
View File

@ -56,7 +56,7 @@ PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements
# Save the state of TROVE_BRANCH first, since it's used in trovestack # Save the state of TROVE_BRANCH first, since it's used in trovestack
TROVE_BRANCH_ORIG=${TROVE_BRANCH} TROVE_BRANCH_ORIG=${TROVE_BRANCH}
# Devstack and OpenStack git repo source paths, etc. # Devstack and OpenStack git repo source paths, etc.
GIT_BASE=${GIT_BASE:-https://git.openstack.org} GIT_BASE=${GIT_BASE:-https://opendev.org}
GIT_OPENSTACK=${GIT_OPENSTACK:-${GIT_BASE}/openstack} GIT_OPENSTACK=${GIT_OPENSTACK:-${GIT_BASE}/openstack}
DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git} DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git}
TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git} TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git}

2
test-upper-constraints.txt
View File

@ -1 +1 @@
git+https://git.openstack.org/openstack/python-troveclient#egg=python-troveclient git+https://opendev.org/openstack/python-troveclient#egg=python-troveclient