From d7142c04d23f348da55202a2d8696d3eddb18699 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 23 Apr 2019 19:40:09 +0800 Subject: [PATCH] Replace git.openstack.org URLs with opendev.org URLs Change-Id: I8241e8207c5caee7cb9c479bcca6196fedbc7fa3 --- README.rst | 2 +- ansible/group_vars/all | 2 +- doc/source/install.rst | 2 +- playbooks/tenks-deploy-teardown/vars/common.yml | 4 ++-- tox.ini | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.rst b/README.rst index fd9e774..884cb96 100644 --- a/README.rst +++ b/README.rst @@ -24,6 +24,6 @@ To get started with Tenks, see the documentation (linked below). * License: Apache License, Version 2.0 * Documentation: https://docs.openstack.org/tenks/ -* Source: https://git.openstack.org/cgit/openstack/tenks/ +* Source: https://opendev.org/openstack/tenks/ * Bugs: https://storyboard.openstack.org/#!/project/openstack/tenks * Known issues/limitations: refer to the documentation. diff --git a/ansible/group_vars/all b/ansible/group_vars/all index 6eee2da..d0c25e8 100644 --- a/ansible/group_vars/all +++ b/ansible/group_vars/all @@ -6,4 +6,4 @@ virtualenv_path: "{{ '/'.join([ansible_env['HOME'], 'tenks-venv']) }}" # The URL of the upper constraints file to pass to pip when installing Python # packages. python_upper_constraints_url: >- - https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt + https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt diff --git a/doc/source/install.rst b/doc/source/install.rst index 9d20d77..95c0a49 100644 --- a/doc/source/install.rst +++ b/doc/source/install.rst @@ -53,7 +53,7 @@ Activate the virtualenv and update pip:: Obtain the Tenks source code and change into the directory. For example:: - (tenks) $ git clone https://git.openstack.org/openstack/tenks.git + (tenks) $ git clone https://opendev.org/openstack/tenks.git (tenks) $ cd tenks Install Tenks and its requirements using the source code checkout:: diff --git a/playbooks/tenks-deploy-teardown/vars/common.yml b/playbooks/tenks-deploy-teardown/vars/common.yml index 150c498..1027ea3 100644 --- a/playbooks/tenks-deploy-teardown/vars/common.yml +++ b/playbooks/tenks-deploy-teardown/vars/common.yml @@ -2,8 +2,8 @@ # Variables shared between the playbooks -tenks_src_dir: "{{ ansible_env.HOME ~ '/' ~ zuul.projects['git.openstack.org/openstack/tenks'].src_dir }}" -upper_constraints_path: "{{ ansible_env.HOME ~ '/' ~ zuul.projects['git.openstack.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" +tenks_src_dir: "{{ ansible_env.HOME ~ '/' ~ zuul.projects['opendev.org/openstack/tenks'].src_dir }}" +upper_constraints_path: "{{ ansible_env.HOME ~ '/' ~ zuul.projects['opendev.org/openstack/requirements'].src_dir ~ '/upper-constraints.txt' }}" tenks_venv: "{{ ansible_env.HOME ~ '/' ~ 'venv-tenks' }}" config_dir: "{{ ansible_env.HOME ~ '/' ~ 'tenks-config' }}" tenks_overrides_path: "{{ config_dir ~ '/' ~ 'tenks-overrides.yml' }}" diff --git a/tox.ini b/tox.ini index 24dce5b..fd52d6e 100644 --- a/tox.ini +++ b/tox.ini @@ -18,7 +18,7 @@ setenv = OS_STDERR_CAPTURE=1 OS_TEST_TIMEOUT=60 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt?h=stable/rocky} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = @@ -32,7 +32,7 @@ commands = [testenv:docs] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt?h=stable/rocky} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands = sphinx-build -W -b html doc/source doc/build/html @@ -40,7 +40,7 @@ commands = sphinx-build -W -b html doc/source doc/build/html [testenv:venv] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt?h=stable/rocky} -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt commands = {posargs} @@ -71,7 +71,7 @@ commands = bash -c "ansible-lint \ [testenv:releasenotes] basepython = python3 deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/rocky} + -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt?h=stable/rocky} -r{toxinidir}/requirements.txt -r{toxinidir}/doc/requirements.txt commands =