diff --git a/README.rst b/README.rst index 71798365..6fa24d49 100644 --- a/README.rst +++ b/README.rst @@ -31,7 +31,7 @@ To run the unit tests use: For information on contributing, see `Contribution Guidelines`_. * License: Apache License, Version 2.0 -* Source: https://git.openstack.org/cgit/openstack/monasca-common +* Source: https://opendev.org/openstack/monasca-common * Bugs: https://storyboard.openstack.org/#!/project/865 .. _`Contribution Guidelines`: https://docs.openstack.org/monasca-api/latest/contributor/index.html diff --git a/docker/example/Dockerfile b/docker/example/Dockerfile index affff05c..f76a6bf8 100644 --- a/docker/example/Dockerfile +++ b/docker/example/Dockerfile @@ -1,6 +1,6 @@ # Example Dockerfile for creating Docker image. ARG DOCKER_IMAGE=monasca-api -ARG APP_REPO=https://git.openstack.org/openstack/monasca-api +ARG APP_REPO=https://opendev.org/openstack/monasca-api # Branch, tag or git hash to build from. ARG REPO_VERSION=master diff --git a/docker/example/build_image.sh b/docker/example/build_image.sh index 1dccc488..74020bea 100755 --- a/docker/example/build_image.sh +++ b/docker/example/build_image.sh @@ -55,12 +55,12 @@ set -eo pipefail # Exit the script if any statement returns error. REPO_VERSION_CLEAN=$(echo "$REPO_VERSION" | sed 's|/|-|g') [ -z "$APP_REPO" ] && APP_REPO=$(\grep APP_REPO Dockerfile | cut -f2 -d"=") -GITHUB_REPO=$(echo "$APP_REPO" | sed 's/git.openstack.org/github.com/' | \ +GITHUB_REPO=$(echo "$APP_REPO" | sed 's/opendev.org/github.com/' | \ sed 's/ssh:/https:/') if [ -z "$CONSTRAINTS_FILE" ]; then CONSTRAINTS_FILE=$(\grep CONSTRAINTS_FILE Dockerfile | cut -f2 -d"=") || true - : "${CONSTRAINTS_FILE:=http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}" + : "${CONSTRAINTS_FILE:=http://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}" fi : "${CONSTRAINTS_BRANCH:=$2}" @@ -88,7 +88,7 @@ esac # Monasca-common variables. if [ -z "$COMMON_REPO" ]; then COMMON_REPO=$(\grep COMMON_REPO Dockerfile | cut -f2 -d"=") || true - : "${COMMON_REPO:=https://git.openstack.org/openstack/monasca-common}" + : "${COMMON_REPO:=https://opendev.org/openstack/monasca-common}" fi : "${COMMON_VERSION:=$3}" if [ -z "$COMMON_VERSION" ]; then diff --git a/tox.ini b/tox.ini index c8cae1d1..6265034a 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ whitelist_externals = bash rm install_command = pip install {opts} {packages} deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands =