diff --git a/README.rst b/README.rst index 9810bee4..9778a08d 100644 --- a/README.rst +++ b/README.rst @@ -41,8 +41,8 @@ included playbooks, for example: - include: common/test-prepare-keys.yml -.. _galera_client repository tox.ini: https://git.openstack.org/cgit/openstack/openstack-ansible-galera_client/tree/tox.ini -.. _neutron role tox.ini: https://git.openstack.org/cgit/openstack/openstack-ansible-os_neutron/tree/tox.ini +.. _galera_client repository tox.ini: https://opendev.org/openstack/openstack-ansible-galera_client/src/tox.ini +.. _neutron role tox.ini: https://opendev.org/openstack/openstack-ansible-os_neutron/src/tox.ini Network Settings ~~~~~~~~~~~~~~~~ diff --git a/Vagrantfile b/Vagrantfile index 5b2e2da5..2bf1cf91 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,6 +1,6 @@ # Note: # This file is maintained in the openstack-ansible-tests repository. -# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/Vagrantfile +# https://opendev.org/openstack/openstack-ansible-tests/src/Vagrantfile # # If you need to perform any change on it, you should modify the central file, # then, an OpenStack CI job will propagate your changes to every OSA repository diff --git a/bindep.txt b/bindep.txt index c648fb1c..ef56cb61 100644 --- a/bindep.txt +++ b/bindep.txt @@ -3,7 +3,7 @@ # # See the following for details: # - https://docs.openstack.org/infra/bindep/ -# - https://git.openstack.org/cgit/openstack-infra/bindep +# - https://opendev.org/openstack-infra/bindep # # Even if the role does not make use of this facility, it # is better to have this file empty, otherwise OpenStack-CI @@ -12,7 +12,7 @@ # # Note: # This file is maintained in the openstack-ansible-tests repository. -# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/bindep.txt +# https://opendev.org/openstack/openstack-ansible-tests/src/bindep.txt # If you need to remove or add extra dependencies, you should modify # the central file instead and once your change is accepted then update # this file as well. The purpose of this file is to ensure that Python and diff --git a/doc/source/conf.py b/doc/source/conf.py index d76c182d..ee755870 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -68,7 +68,7 @@ title = 'OpenStack-Ansible Documentation: ' + role_name + 'role' # The link to the browsable source code (for the left hand menu) oslosphinx_cgit_link = ( - "https://git.openstack.org/cgit/openstack/{}".format(target_name) + "https://opendev.org/openstack/{}".format(target_name) ) # The version info for the project you're documenting, acts as replacement for diff --git a/gen-projects-list.sh b/gen-projects-list.sh index f3f994c3..7828d963 100755 --- a/gen-projects-list.sh +++ b/gen-projects-list.sh @@ -17,7 +17,7 @@ # Get list of all the maintained OpenStack Ansible projects # 'exclude_projects' variable should contain all the OSA projects -# listed in https://git.openstack.org/cgit/ but should be excluded +# listed in https://opendev.org/ but should be excluded # from the generated list for various reasons (ie unmaintained, # not applicable etc) diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py index 4d8c678f..8237135f 100644 --- a/releasenotes/source/conf.py +++ b/releasenotes/source/conf.py @@ -64,7 +64,7 @@ title = 'OpenStack-Ansible Documentation: Central testing repository' # The link to the browsable source code (for the left hand menu) oslosphinx_cgit_link = ( - "https://git.openstack.org/cgit/openstack/{}".format(target_name) + "https://opendev.org/openstack/{}".format(target_name) ) # Release notes do not need a version number in the title, they diff --git a/run_tests.sh b/run_tests.sh index 0d2891de..cd30a60b 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -21,7 +21,7 @@ # WARNING: # This file is maintained in the openstack-ansible-tests repository. -# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/run_tests.sh +# https://opendev.org/openstack/openstack-ansible-tests/src/run_tests.sh # If you need to modify this file, update the one in the openstack-ansible-tests # repository and then update this file as well. The purpose of this file is to # prepare the host and then execute all the tox tests. @@ -75,7 +75,7 @@ if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then ln -s "${WORKING_DIR}" "${COMMON_TESTS_PATH}" # In zuul v3 any dependent repository is placed into - # /home/zuul/src/git.openstack.org, so we check to see + # /home/zuul/src/opendev.org, so we check to see # if there is a tests checkout there already. If so, we # symlink that and use it. elif [[ -d "${ZUUL_TESTS_CLONE_LOCATION}" ]]; then @@ -85,7 +85,7 @@ if [[ ! -d "${COMMON_TESTS_PATH}" ]]; then # repo in some way, so just clone it from upstream. else git clone -b "${TESTING_BRANCH}" \ - https://git.openstack.org/openstack/openstack-ansible-tests \ + https://opendev.org/openstack/openstack-ansible-tests \ "${COMMON_TESTS_PATH}" fi fi diff --git a/sync-test-repos.sh b/sync-test-repos.sh index 09f3f399..cbb48131 100755 --- a/sync-test-repos.sh +++ b/sync-test-repos.sh @@ -24,7 +24,7 @@ # should be submitted to the openstack-ansible project on launchpad as usual. # This script has a partner which is executed by the proposal bot here: -# https://git.openstack.org/cgit/openstack-infra/project-config/tree/playbooks/proposal/sync_openstack_ansible_common_files.sh +# https://opendev.org/openstack/project-config/src/playbooks/proposal/sync_openstack_ansible_common_files.sh # Changes made to this file should be mirrored there when applicable. set -eu @@ -116,7 +116,7 @@ copy_files() { # Do not change these files unless you know what you are doing declare -ra files_to_sync=(run_tests.sh bindep.txt Vagrantfile tests/tests-repo-clone.sh .gitignore sync/tasks/*) -declare -r openstack_git_url="https://git.openstack.org" +declare -r openstack_git_url="https://opendev.org" excluded_projects= dry_run=false diff --git a/sync/tasks/mq_setup.yml b/sync/tasks/mq_setup.yml index a638febb..4479809e 100644 --- a/sync/tasks/mq_setup.yml +++ b/sync/tasks/mq_setup.yml @@ -15,7 +15,7 @@ # WARNING: # This file is maintained in the openstack-ansible-tests repository. -# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/tasks/mq_setup.yml +# https://opendev.org/openstack/openstack-ansible-tests/src/sync/tasks/mq_setup.yml # If you need to modify this file, update the one in the openstack-ansible-tests # repository. Once it merges there, the changes will automatically be proposed to # all the repositories which use it. diff --git a/test-ansible-env-prep.sh b/test-ansible-env-prep.sh index ce21e974..63212801 100755 --- a/test-ansible-env-prep.sh +++ b/test-ansible-env-prep.sh @@ -46,7 +46,7 @@ export ANSIBLE_ROLE_DIR="${TESTING_HOME}/.ansible/testing-role" export COMMON_TESTS_PATH="${WORKING_DIR}/tests/common" # The place where zuul clones dependent repositories to -ZUUL_PLUGINS_CLONE_LOCATION="/home/zuul/src/git.openstack.org/openstack/openstack-ansible-plugins" +ZUUL_PLUGINS_CLONE_LOCATION="/home/zuul/src/opendev.org/openstack/openstack-ansible-plugins" # Use .gitreview as the key to determine the appropriate # branch to clone for tests. @@ -115,7 +115,7 @@ if [[ ! -d "${ANSIBLE_PLUGIN_DIR}" ]]; then ln -s ${WORKING_DIR} "${ANSIBLE_PLUGIN_DIR}" # In zuul v3 any dependent repository is placed into - # /home/zuul/src/git.openstack.org, so we check to see + # /home/zuul/src/opendev.org, so we check to see # if there is a tests checkout there already. If so, we # symlink that and use it. elif [[ -d "${ZUUL_PLUGINS_CLONE_LOCATION}" ]]; then @@ -125,7 +125,7 @@ if [[ ! -d "${ANSIBLE_PLUGIN_DIR}" ]]; then # repo in some way, so just clone it from upstream. else git clone -b "${TESTING_BRANCH}" \ - https://git.openstack.org/openstack/openstack-ansible-plugins \ + https://opendev.org/openstack/openstack-ansible-plugins \ "${ANSIBLE_PLUGIN_DIR}" fi fi @@ -170,25 +170,25 @@ PIP_OPTS+=" --constraint ${COMMON_TESTS_PATH}/test-ansible-deps.txt" # If Depends-On is used, the integrated repo will be cloned. We # therefore prefer a local copy over fetching it via a URL. -OSA_INTEGRATED_REPO_HOME="${TESTING_HOME}/src/git.openstack.org/openstack/openstack-ansible" +OSA_INTEGRATED_REPO_HOME="${TESTING_HOME}/src/opendev.org/openstack/openstack-ansible" if [[ -d "${OSA_INTEGRATED_REPO_HOME}" ]]; then PIP_OPTS+=" --constraint ${OSA_INTEGRATED_REPO_HOME}/global-requirement-pins.txt" else - PIP_OPTS+=" --constraint https://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt" + PIP_OPTS+=" --constraint https://opendev.org/openstack/openstack-ansible/raw/${TESTING_BRANCH}/global-requirement-pins.txt" fi # We add OpenStack's upper constraints last, as we want all our own # constraints to take precedence. If Depends-On is used, the requirements # repo will be cloned, so we prefer a local copy. -REQS_REPO_HOME="${TESTING_HOME}/src/git.openstack.org/openstack/requirements" +REQS_REPO_HOME="${TESTING_HOME}/src/opendev.org/openstack/requirements" if [[ -d "${REQS_REPO_HOME}" ]]; then PIP_OPTS+=" --constraint ${REQS_REPO_HOME}/upper-constraints.txt" else - PIP_OPTS+=" --constraint ${UPPER_CONSTRAINTS_FILE:-https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}" + PIP_OPTS+=" --constraint ${UPPER_CONSTRAINTS_FILE:-https://opendev.org/openstack/requirements/raw/${TESTING_BRANCH}/upper-constraints.txt}" fi # Install ARA from source if running in ARA gate, otherwise install from PyPi -ARA_SRC_HOME="${TESTING_HOME}/src/git.openstack.org/openstack/ara" +ARA_SRC_HOME="${TESTING_HOME}/src/opendev.org/recordsansible/ara" if [[ -d "${ARA_SRC_HOME}" ]]; then PIP_OPTS+=" ${ARA_SRC_HOME}" else diff --git a/test-ansible-role-requirements.yml b/test-ansible-role-requirements.yml index 0bfd30ad..e57fa61c 100644 --- a/test-ansible-role-requirements.yml +++ b/test-ansible-role-requirements.yml @@ -1,25 +1,25 @@ --- - name: config_template scm: git - src: https://git.openstack.org/openstack/ansible-config_template + src: https://opendev.org/openstack/ansible-config_template version: master - name: openstack_openrc scm: git - src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc + src: https://opendev.org/openstack/openstack-ansible-openstack_openrc version: master - name: python_venv_build - src: https://git.openstack.org/openstack/ansible-role-python_venv_build + src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git version: master - name: systemd_mount - src: https://git.openstack.org/openstack/ansible-role-systemd_mount + src: https://opendev.org/openstack/ansible-role-systemd_mount scm: git version: master - name: systemd_networkd - src: https://git.openstack.org/openstack/ansible-role-systemd_networkd + src: https://opendev.org/openstack/ansible-role-systemd_networkd scm: git version: master - name: systemd_service - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service scm: git version: master diff --git a/test-repo-setup.yml b/test-repo-setup.yml index 72589650..29c555ba 100644 --- a/test-repo-setup.yml +++ b/test-repo-setup.yml @@ -31,7 +31,7 @@ # # /src// # - # eg: /home/zuul/src/git.openstack.org/keystone + # eg: /home/zuul/src/opendev.org/keystone # /home/zuul/src/github.com/projectcalico/felix # - name: Check for repositories that are cloned in the repos directory diff --git a/test-vars.yml b/test-vars.yml index 282c7bae..4517f789 100644 --- a/test-vars.yml +++ b/test-vars.yml @@ -357,7 +357,7 @@ horizon_secret_key: "SuperSecreteHorizonKey" horizon_external_ssl: False # Tempest specific settings -tempest_git_repo: https://git.openstack.org/openstack/tempest +tempest_git_repo: https://opendev.org/openstack/tempest # We prefer to use the released versions of tempest for stable branches, but # we deploy the latest for the master branch. tempest_developer_mode: "{{ test_branch == 'master' }}" @@ -434,7 +434,7 @@ ironic_wsgi_processes: 2 pip_install_options: "--no-binary libvirt-python" # The URL/path of a constraints file to use when installing the additional pip packages. -pip_install_upper_constraints: "http://git.openstack.org/cgit/openstack/openstack-ansible/plain/global-requirement-pins.txt?h={{ test_branch }} --constraint http://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h={{ test_branch }}" +pip_install_upper_constraints: "https://opendev.org/openstack/openstack-ansible/raw/{{ test_branch }}/global-requirement-pins.txt --constraint https://opendev.org/openstack/requirements/raw/{{ test_branch }}/upper-constraints.txt" # Overriding the developer_constraints allows us to install from local disk as a precedence # if the repo is present. diff --git a/tests/ansible-role-requirements.yml b/tests/ansible-role-requirements.yml index 41fae394..fdba6e42 100644 --- a/tests/ansible-role-requirements.yml +++ b/tests/ansible-role-requirements.yml @@ -1,57 +1,57 @@ --- - name: apt_package_pinning - src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning + src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning scm: git version: master - name: pip_install - src: https://git.openstack.org/openstack/openstack-ansible-pip_install + src: https://opendev.org/openstack/openstack-ansible-pip_install scm: git version: master - name: memcached_server - src: https://git.openstack.org/openstack/openstack-ansible-memcached_server + src: https://opendev.org/openstack/openstack-ansible-memcached_server scm: git version: master - name: openstack_hosts - src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts + src: https://opendev.org/openstack/openstack-ansible-openstack_hosts scm: git version: master - name: lxc_hosts - src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts + src: https://opendev.org/openstack/openstack-ansible-lxc_hosts scm: git version: master - name: lxc_container_create - src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create + src: https://opendev.org/openstack/openstack-ansible-lxc_container_create scm: git version: master - name: galera_client - src: https://git.openstack.org/openstack/openstack-ansible-galera_client + src: https://opendev.org/openstack/openstack-ansible-galera_client scm: git version: master - name: galera_server - src: https://git.openstack.org/openstack/openstack-ansible-galera_server + src: https://opendev.org/openstack/openstack-ansible-galera_server scm: git version: master - name: rabbitmq_server - src: https://git.openstack.org/openstack/openstack-ansible-rabbitmq_server + src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server scm: git version: master - name: os_keystone - src: https://git.openstack.org/openstack/openstack-ansible-os_keystone + src: https://opendev.org/openstack/openstack-ansible-os_keystone scm: git version: master - name: openstack_openrc - src: https://git.openstack.org/openstack/openstack-ansible-openstack_openrc + src: https://opendev.org/openstack/openstack-ansible-openstack_openrc scm: git version: master - name: os_tempest - src: https://git.openstack.org/openstack/openstack-ansible-os_tempest + src: https://opendev.org/openstack/openstack-ansible-os_tempest scm: git version: master - name: systemd_service - src: https://git.openstack.org/openstack/ansible-role-systemd_service + src: https://opendev.org/openstack/ansible-role-systemd_service scm: git version: master - name: python_venv_build - src: https://git.openstack.org/openstack/ansible-role-python_venv_build + src: https://opendev.org/openstack/ansible-role-python_venv_build scm: git version: master diff --git a/tox.ini b/tox.ini index 5030ec96..8febadd5 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist = docs,linters,func [testenv] usedevelop = True install_command = - pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} + pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages} commands = /usr/bin/find . -type f -name "*.pyc" -delete passenv =