From 3aa33e62a3ecd2a19ed05b51312544c68d8a3fbc Mon Sep 17 00:00:00 2001
From: zhulingjie <easyzlj@gmail.com>
Date: Tue, 23 Apr 2019 16:41:16 +0800
Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs

Change-Id: I66f8508ab8e29e189a16e7155caa21484486a825
---
 common/build_common.sh      |  2 +-
 docker/build_image.sh       | 10 +++++-----
 monasca_persister/README.md |  4 ++--
 tox.ini                     |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/common/build_common.sh b/common/build_common.sh
index 03d3a88e..d96b72a7 100755
--- a/common/build_common.sh
+++ b/common/build_common.sh
@@ -23,7 +23,7 @@ fi
 
 # This should only be done on the stack forge system
 if [ "${BUILD_COMMON}" = "true" ]; then
-   git clone -b ${BRANCH} https://git.openstack.org/openstack/monasca-common --depth 1
+   git clone -b ${BRANCH} https://opendev.org/openstack/monasca-common --depth 1
    cd monasca-common
    ${MVN} clean
    ${MVN} install
diff --git a/docker/build_image.sh b/docker/build_image.sh
index 730c5eb5..2c350552 100755
--- a/docker/build_image.sh
+++ b/docker/build_image.sh
@@ -59,12 +59,12 @@ cd "$(dirname "$REAL_PATH")/../docker/"
 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/review.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:=https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}"
 fi
 
 : "${CONSTRAINTS_BRANCH:=$2}"
@@ -75,10 +75,11 @@ fi
 case "$REPO_VERSION" in
     *stable*)
         CONSTRAINTS_BRANCH_CLEAN="$REPO_VERSION"
+        CONSTRAINTS_FILE=${CONSTRAINTS_FILE/master/$CONSTRAINTS_BRANCH_CLEAN}
         # Get monasca-common version from stable upper constraints file.
         CONSTRAINTS_TMP_FILE=$(mktemp)
         wget --output-document "$CONSTRAINTS_TMP_FILE" \
-            "$CONSTRAINTS_FILE"?h="$CONSTRAINTS_BRANCH_CLEAN"
+            $CONSTRAINTS_FILE
         UPPER_COMMON=$(\grep 'monasca-common' "$CONSTRAINTS_TMP_FILE")
         # Get only version part from monasca-common.
         UPPER_COMMON_VERSION="${UPPER_COMMON##*===}"
@@ -92,7 +93,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://review.opendev.org/openstack/monasca-common}"
 fi
 : "${COMMON_VERSION:=$3}"
 if [ -z "$COMMON_VERSION" ]; then
@@ -143,7 +144,6 @@ docker build --no-cache \
     --build-arg REPO_VERSION="$REPO_VERSION" \
     --build-arg GIT_COMMIT="$GIT_COMMIT" \
     --build-arg CONSTRAINTS_FILE="$CONSTRAINTS_FILE" \
-    --build-arg CONSTRAINTS_BRANCH="$CONSTRAINTS_BRANCH_CLEAN" \
     --build-arg COMMON_REPO="$COMMON_REPO" \
     --build-arg COMMON_VERSION="$COMMON_VERSION" \
     --build-arg COMMON_GIT_COMMIT="$COMMON_GIT_COMMIT" \
diff --git a/monasca_persister/README.md b/monasca_persister/README.md
index 485b440e..c98b7ab8 100644
--- a/monasca_persister/README.md
+++ b/monasca_persister/README.md
@@ -44,7 +44,7 @@ to pip.
 
 ```
 sudo apt-get install git
-sudo pip install git+https://git.openstack.org/openstack/monasca-persister@<revision>#egg=monasca-persister
+sudo pip install git+https://opendev.org/openstack/monasca-persister@<revision>#egg=monasca-persister
 ```
 
 The installation will not cause the persister to run - it should first
@@ -204,4 +204,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
 implied.
 See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
+limitations under the License.
diff --git a/tox.ini b/tox.ini
index fc58d499..5ebfbf9a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,7 +19,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}
   .[influxdb,cassandra,elasticsearch]
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt