diff --git a/README.rst b/README.rst index 4c9a1b91..3860fb50 100644 --- a/README.rst +++ b/README.rst @@ -251,7 +251,7 @@ Note: before starting the upgrade process make sure that both the undercloud and overcloud nodes have the repositories with upgraded packages set up Clone this repository - git clone https://git.openstack.org/openstack/tripleo-upgrade + git clone https://opendev.org/openstack/tripleo-upgrade Set ansible roles path:: ANSIBLE_ROLES_PATH=$(pwd) diff --git a/setup.cfg b/setup.cfg index e7686a24..c33af560 100644 --- a/setup.cfg +++ b/setup.cfg @@ -5,7 +5,7 @@ description-file = README.rst author = TripleO Team author-email = openstack-discuss@lists.openstack.org -home-page = https://git.openstack.org/cgit/openstack/tripleo-upgrade +home-page = https://opendev.org/openstack/tripleo-upgrade classifier = License :: OSI Approved :: Apache Software License Development Status :: 4 - Beta diff --git a/templates/fast-forward-upgrade/undercloud_workarounds_post.sh.j2 b/templates/fast-forward-upgrade/undercloud_workarounds_post.sh.j2 index 54240e0b..1dac7718 100644 --- a/templates/fast-forward-upgrade/undercloud_workarounds_post.sh.j2 +++ b/templates/fast-forward-upgrade/undercloud_workarounds_post.sh.j2 @@ -7,7 +7,7 @@ function apply_patch { local patch_dir=$1 local patch_id=$2 - curl -4 https://review.openstack.org/changes/${patch_id}/revisions/current/patch?download | \ + curl -4 https://review.opendev.org/changes/${patch_id}/revisions/current/patch?download | \ base64 -d > /tmp/patch.txt if sudo patch --dry-run --reverse --force -d ${patch_dir} -p1 < /tmp/patch.txt >/dev/null 2>&1 diff --git a/templates/fast-forward-upgrade/undercloud_workarounds_pre.sh.j2 b/templates/fast-forward-upgrade/undercloud_workarounds_pre.sh.j2 index 69e57615..abed34f3 100644 --- a/templates/fast-forward-upgrade/undercloud_workarounds_pre.sh.j2 +++ b/templates/fast-forward-upgrade/undercloud_workarounds_pre.sh.j2 @@ -7,7 +7,7 @@ function apply_patch { local patch_dir=$1 local patch_id=$2 - curl -4 https://review.openstack.org/changes/${patch_id}/revisions/current/patch?download | \ + curl -4 https://review.opendev.org/changes/${patch_id}/revisions/current/patch?download | \ base64 -d > /tmp/patch.txt if sudo patch --dry-run --reverse --force -d ${patch_dir} -p1 < /tmp/patch.txt >/dev/null 2>&1 diff --git a/templates/fast-forward-upgrade/workarounds.sh.j2 b/templates/fast-forward-upgrade/workarounds.sh.j2 index 804b73d5..6f714333 100644 --- a/templates/fast-forward-upgrade/workarounds.sh.j2 +++ b/templates/fast-forward-upgrade/workarounds.sh.j2 @@ -10,11 +10,11 @@ function apply_patch { temp_dir=$( mktemp -d ) - curl -4 --retry 5 https://review.openstack.org/changes/${patch_id}/revisions/current/patch?download | \ + curl -4 --retry 5 https://review.opendev.org/changes/${patch_id}/revisions/current/patch?download | \ base64 -d > ${temp_dir}/patch.txt if [[ ${?} -ne 0 ]] ; then - echo "Failed to download patch https://review.openstack.org/#/c/${patch_id}/" + echo "Failed to download patch https://review.opendev.org/#/c/${patch_id}/" exit 1 fi diff --git a/templates/update_workarounds.sh.j2 b/templates/update_workarounds.sh.j2 index 497dcd85..fb5bf99e 100644 --- a/templates/update_workarounds.sh.j2 +++ b/templates/update_workarounds.sh.j2 @@ -8,7 +8,7 @@ set -euo pipefail {% for workaround in item.workarounds %} {% if workaround.patch_id %} -curl -4 'https://review.openstack.org/changes/{{workaround.patch_id}}/revisions/current/patch?download' | \ +curl -4 'https://review.opendev.org/changes/{{workaround.patch_id}}/revisions/current/patch?download' | \ base64 -d | \ sudo patch -d {{ workaround.directory }} -p1 {{ workaround.misc }} {% endif %} {# end of item.patch_id #} diff --git a/templates/workarounds.sh.j2 b/templates/workarounds.sh.j2 index 073f5a25..0aca810c 100644 --- a/templates/workarounds.sh.j2 +++ b/templates/workarounds.sh.j2 @@ -10,11 +10,11 @@ function apply_patch { temp_dir=$( mktemp -d ) - curl -4 --retry 5 https://review.openstack.org/changes/${patch_id}/revisions/current/patch?download | \ + curl -4 --retry 5 https://review.opendev.org/changes/${patch_id}/revisions/current/patch?download | \ base64 -d > ${temp_dir}/patch.txt if [[ ${?} -ne 0 ]] ; then - echo "Failed to download patch https://review.openstack.org/#/c/${patch_id}/" + echo "Failed to download patch https://review.opendev.org/#/c/${patch_id}/" exit 1 fi diff --git a/tox.ini b/tox.ini index d32d9ee1..9efff54e 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ skipdist = True [testenv] usedevelop = True -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens} {opts} {packages} +install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/queens} {opts} {packages} setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt whitelist_externals = bash