From c9f98e63e3de4b897461ba63c2213d340663b3e4 Mon Sep 17 00:00:00 2001 From: OpenDev Sysadmins Date: Fri, 19 Apr 2019 19:39:10 +0000 Subject: [PATCH] OpenDev Migration Patch This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have. --- .gitreview | 2 +- .zuul.yaml | 34 +++++++++---------- .../neutron-grenade-dvr-multinode/run.yaml | 8 ++--- .../legacy/neutron-grenade-multinode/run.yaml | 8 ++--- playbooks/legacy/neutron-grenade/run.yaml | 8 ++--- .../neutron-tempest-postgres-full/run.yaml | 6 ++-- .../run.yaml | 6 ++-- .../defaults/main.yaml | 4 +-- 8 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.gitreview b/.gitreview index cf0bca5c0eb..c2f0ba44997 100644 --- a/.gitreview +++ b/.gitreview @@ -1,5 +1,5 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/neutron.git defaultbranch=stable/stein diff --git a/.zuul.yaml b/.zuul.yaml index 663a79977b9..5e6bec57208 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -106,10 +106,10 @@ description: Run neutron functional tests timeout: 7800 required-projects: - - git.openstack.org/openstack-dev/devstack + - opendev.org/openstack/devstack - openstack/neutron roles: - - zuul: openstack-dev/devstack + - zuul: openstack/devstack pre-run: playbooks/configure_functional_job.yaml run: playbooks/run_functional_job.yaml post-run: playbooks/post_functional_job.yaml @@ -162,8 +162,8 @@ devstack_localrc: USE_PYTHON3: true devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - neutron: https://git.openstack.org/openstack/neutron + rally-openstack: https://opendev.org/openstack/rally-openstack + neutron: https://opendev.org/openstack/neutron devstack_services: neutron-trunk: true rally_task: rally-jobs/task-neutron.yaml @@ -183,7 +183,7 @@ parent: tempest-full-py3 timeout: 10800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest vars: @@ -197,7 +197,7 @@ parent: tempest-full-py3 timeout: 10800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest vars: @@ -223,8 +223,8 @@ post-run: playbooks/legacy/neutron-grenade-multinode/post.yaml timeout: 10800 required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate + - openstack/grenade + - openstack/devstack-gate - openstack/neutron irrelevant-files: *tempest-irrelevant-files @@ -235,8 +235,8 @@ post-run: playbooks/legacy/neutron-grenade-dvr-multinode/post.yaml timeout: 7500 required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate + - openstack/grenade + - openstack/devstack-gate - openstack/neutron irrelevant-files: *tempest-irrelevant-files @@ -248,7 +248,7 @@ roles: - zuul: openstack/neutron-tempest-plugin required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest pre-run: playbooks/dvr-multinode-scenario-pre-run.yaml @@ -315,13 +315,13 @@ parent: tempest-full-py3 timeout: 10800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest vars: tempest_concurrency: 4 devstack_plugins: - neutron: git://git.openstack.org/openstack/neutron.git + neutron: git://opendev.org/openstack/neutron.git devstack_services: tls-proxy: false tempest: true @@ -379,8 +379,8 @@ post-run: playbooks/legacy/neutron-grenade/post.yaml timeout: 10800 required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate + - openstack/grenade + - openstack/devstack-gate - openstack/neutron irrelevant-files: *tempest-irrelevant-files @@ -391,7 +391,7 @@ post-run: playbooks/legacy/neutron-tempest-postgres-full/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest @@ -402,7 +402,7 @@ post-run: playbooks/legacy/neutron-tempest-with-os-ken-master/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest diff --git a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml index 60426b276bb..ea61d449f55 100644 --- a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml +++ b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml @@ -13,12 +13,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate + git://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -33,7 +33,7 @@ export DEVSTACK_GATE_GRENADE=pullup export DEVSTACK_GATE_USE_PYTHON3=True # Test DVR upgrade on multinode - export PROJECTS="openstack-dev/grenade $PROJECTS" + export PROJECTS="openstack/grenade $PROJECTS" export DEVSTACK_GATE_NEUTRON_DVR=1 export BRANCH_OVERRIDE=default if [ "$BRANCH_OVERRIDE" != "default" ] ; then diff --git a/playbooks/legacy/neutron-grenade-multinode/run.yaml b/playbooks/legacy/neutron-grenade-multinode/run.yaml index 02904d5706f..34e28d40797 100644 --- a/playbooks/legacy/neutron-grenade-multinode/run.yaml +++ b/playbooks/legacy/neutron-grenade-multinode/run.yaml @@ -13,12 +13,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate + git://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -32,7 +32,7 @@ export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_GRENADE=pullup export DEVSTACK_GATE_USE_PYTHON3=True - export PROJECTS="openstack-dev/grenade $PROJECTS" + export PROJECTS="openstack/grenade $PROJECTS" # Default to non DVR export DEVSTACK_GATE_NEUTRON_DVR=0 export BRANCH_OVERRIDE=default diff --git a/playbooks/legacy/neutron-grenade/run.yaml b/playbooks/legacy/neutron-grenade/run.yaml index 31701b8cfd0..a9ce70b2cd3 100644 --- a/playbooks/legacy/neutron-grenade/run.yaml +++ b/playbooks/legacy/neutron-grenade/run.yaml @@ -13,12 +13,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate + git://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -41,7 +41,7 @@ cmd: | set -e set -x - export PROJECTS="openstack-dev/grenade $PROJECTS" + export PROJECTS="openstack/grenade $PROJECTS" export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_GRENADE=pullup diff --git a/playbooks/legacy/neutron-tempest-postgres-full/run.yaml b/playbooks/legacy/neutron-tempest-postgres-full/run.yaml index 258b048aa15..d7310c82817 100644 --- a/playbooks/legacy/neutron-tempest-postgres-full/run.yaml +++ b/playbooks/legacy/neutron-tempest-postgres-full/run.yaml @@ -14,12 +14,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate + git://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml b/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml index ce9d71e9e4b..5d27209d13e 100644 --- a/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml +++ b/playbooks/legacy/neutron-tempest-with-os-ken-master/run.yaml @@ -14,12 +14,12 @@ set -x cat > clonemap.yaml << EOF clonemap: - - name: openstack-infra/devstack-gate + - name: openstack/devstack-gate dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ - openstack-infra/devstack-gate + git://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/roles/configure_functional_tests/defaults/main.yaml b/roles/configure_functional_tests/defaults/main.yaml index e849e80429b..615b9785085 100644 --- a/roles/configure_functional_tests/defaults/main.yaml +++ b/roles/configure_functional_tests/defaults/main.yaml @@ -1,5 +1,5 @@ tests_venv: "{{ tox_envlist }}" -base_dir: "{{ ansible_user_dir }}/src/git.openstack.org" +base_dir: "{{ ansible_user_dir }}/src/opendev.org" gate_dest_dir: "{{ base_dir }}/openstack" -devstack_dir: "{{ base_dir }}/openstack-dev/devstack" +devstack_dir: "{{ base_dir }}/openstack/devstack" neutron_dir: "{{ gate_dest_dir }}/neutron"