From 945ac47507cbae42fea18a07c8193618fab664f9 Mon Sep 17 00:00:00 2001 From: OpenDev Sysadmins Date: Fri, 19 Apr 2019 19:26:34 +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.d/base.yaml | 8 ++-- .zuul.d/rally-task-barbican.yaml | 8 ++-- .zuul.d/rally-task-heat.yaml | 8 ++-- .zuul.d/rally-task-ironic.yaml | 8 ++-- .zuul.d/rally-task-load-balancing.yaml | 10 ++--- .zuul.d/rally-task-magnum.yaml | 10 ++--- .zuul.d/rally-task-mistral.yaml | 8 ++-- .zuul.d/rally-task-murano.yaml | 10 ++--- .zuul.d/rally-task-neutron-trunk.yaml | 4 +- .../rally-task-neutron-with-extensions.yaml | 12 +++--- .zuul.d/rally-task-telemetry.yaml | 8 ++-- .zuul.d/rally-task-watcher.yaml | 8 ++-- .zuul.d/rally-task-zaqar.yaml | 8 ++-- .zuul.d/rally-tox-functional.yaml | 42 +++++++++---------- .zuul.d/rally-verify-tempest.yaml | 32 +++++++------- .../roles/check-os-resources/tasks/main.yaml | 2 +- .../fetch-rally-task-results/tasks/main.yaml | 4 +- .../tasks/main.yaml | 2 +- 19 files changed, 97 insertions(+), 97 deletions(-) diff --git a/.gitreview b/.gitreview index 7ba9c028..ca068076 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/rally-openstack.git diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 6486ae27..55fc52c2 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -3,17 +3,17 @@ parent: devstack description: Base job for launching Rally task at Devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally-openstack # NOTE(andreykurilin): it is a required project to fetch the latest # version and test master of rally-openstack with master of rally - name: openstack/rally timeout: 7200 roles: - - zuul: openstack-dev/devstack + - zuul: openstack/devstack vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack + rally-openstack: https://opendev.org/openstack/rally-openstack run: tests/ci/playbooks/run-rally-task.yaml post-run: tests/ci/playbooks/post-rally-task.yaml diff --git a/.zuul.d/rally-task-barbican.yaml b/.zuul.d/rally-task-barbican.yaml index 45a75816..2fc45daf 100644 --- a/.zuul.d/rally-task-barbican.yaml +++ b/.zuul.d/rally-task-barbican.yaml @@ -2,16 +2,16 @@ name: rally-task-barbican parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/barbican - name: openstack/python-barbicanclient vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - barbican: https://git.openstack.org/openstack/barbican + rally-openstack: https://opendev.org/openstack/rally-openstack + barbican: https://opendev.org/openstack/barbican devstack_services: barbican: true # disable redundant services for the job diff --git a/.zuul.d/rally-task-heat.yaml b/.zuul.d/rally-task-heat.yaml index 577468e0..b7574be6 100644 --- a/.zuul.d/rally-task-heat.yaml +++ b/.zuul.d/rally-task-heat.yaml @@ -2,15 +2,15 @@ name: rally-task-heat parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/heat vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - heat: https://git.openstack.org/openstack/heat + rally-openstack: https://opendev.org/openstack/rally-openstack + heat: https://opendev.org/openstack/heat devstack_services: # disable redundant services for the job ceilometer-acentral: false diff --git a/.zuul.d/rally-task-ironic.yaml b/.zuul.d/rally-task-ironic.yaml index d793acfc..f678a7ab 100644 --- a/.zuul.d/rally-task-ironic.yaml +++ b/.zuul.d/rally-task-ironic.yaml @@ -2,15 +2,15 @@ name: rally-task-ironic parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/ironic vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - ironic: https://git.openstack.org/openstack/ironic + rally-openstack: https://opendev.org/openstack/rally-openstack + ironic: https://opendev.org/openstack/ironic devstack_services: cinder: true ironic: true diff --git a/.zuul.d/rally-task-load-balancing.yaml b/.zuul.d/rally-task-load-balancing.yaml index f5b3ce6f..c533c5a5 100644 --- a/.zuul.d/rally-task-load-balancing.yaml +++ b/.zuul.d/rally-task-load-balancing.yaml @@ -3,17 +3,17 @@ description: A Rally job for checking Octavia plugins and legacy LbaasV2 parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/neutron-lbaas - name: openstack/octavia vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - neutron-lbaas: https://git.openstack.org/openstack/neutron-lbaas - octavia: https://git.openstack.org/openstack/octavia + rally-openstack: https://opendev.org/openstack/rally-openstack + neutron-lbaas: https://opendev.org/openstack/neutron-lbaas + octavia: https://opendev.org/openstack/octavia devstack_services: neutron-lbaas: true octavia: true diff --git a/.zuul.d/rally-task-magnum.yaml b/.zuul.d/rally-task-magnum.yaml index 0dbc98e6..0df658cb 100644 --- a/.zuul.d/rally-task-magnum.yaml +++ b/.zuul.d/rally-task-magnum.yaml @@ -2,8 +2,8 @@ name: rally-task-magnum parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/magnum @@ -11,9 +11,9 @@ - name: openstack/heat vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - magnum: https://git.openstack.org/openstack/magnum - heat: https://git.openstack.org/openstack/heat + rally-openstack: https://opendev.org/openstack/rally-openstack + magnum: https://opendev.org/openstack/magnum + heat: https://opendev.org/openstack/heat devstack_services: magnum: true # disable redundant services for the job diff --git a/.zuul.d/rally-task-mistral.yaml b/.zuul.d/rally-task-mistral.yaml index 77224e39..8bcf5154 100644 --- a/.zuul.d/rally-task-mistral.yaml +++ b/.zuul.d/rally-task-mistral.yaml @@ -2,8 +2,8 @@ name: rally-task-mistral parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/heat @@ -11,8 +11,8 @@ - name: openstack/python-mistralclient vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - mistral: https://git.openstack.org/openstack/mistral + rally-openstack: https://opendev.org/openstack/rally-openstack + mistral: https://opendev.org/openstack/mistral devstack_services: mistral: true # disable redundant services for the job diff --git a/.zuul.d/rally-task-murano.yaml b/.zuul.d/rally-task-murano.yaml index ecde131c..771588b1 100644 --- a/.zuul.d/rally-task-murano.yaml +++ b/.zuul.d/rally-task-murano.yaml @@ -2,17 +2,17 @@ name: rally-task-murano parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/heat - name: openstack/murano vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - murano: https://git.openstack.org/openstack/murano - heat: https://git.openstack.org/openstack/heat + rally-openstack: https://opendev.org/openstack/rally-openstack + murano: https://opendev.org/openstack/murano + heat: https://opendev.org/openstack/heat devstack_services: murano: true # disable redundant services for the job diff --git a/.zuul.d/rally-task-neutron-trunk.yaml b/.zuul.d/rally-task-neutron-trunk.yaml index a16d0331..75cd8ff1 100644 --- a/.zuul.d/rally-task-neutron-trunk.yaml +++ b/.zuul.d/rally-task-neutron-trunk.yaml @@ -4,8 +4,8 @@ vars: rally_task: rally-jobs/neutron-trunk.yaml 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 diff --git a/.zuul.d/rally-task-neutron-with-extensions.yaml b/.zuul.d/rally-task-neutron-with-extensions.yaml index 5c360159..8b620c31 100644 --- a/.zuul.d/rally-task-neutron-with-extensions.yaml +++ b/.zuul.d/rally-task-neutron-with-extensions.yaml @@ -2,8 +2,8 @@ name: rally-task-neutron-with-extensions parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/networking-bgpvpn @@ -15,10 +15,10 @@ - name: openstack/neutron-vpnaas vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - networking-bgpvpn: https://git.openstack.org/openstack/networking-bgpvpn - #neutron-fwaas: https://git.openstack.org/openstack/neutron-fwaas - neutron-vpnaas: https://git.openstack.org/openstack/neutron-vpnaas + rally-openstack: https://opendev.org/openstack/rally-openstack + networking-bgpvpn: https://opendev.org/openstack/networking-bgpvpn + #neutron-fwaas: https://opendev.org/openstack/neutron-fwaas + neutron-vpnaas: https://opendev.org/openstack/neutron-vpnaas devstack_services: networking-bgpvpn: true #neutron-fwaas: true diff --git a/.zuul.d/rally-task-telemetry.yaml b/.zuul.d/rally-task-telemetry.yaml index e7aa2a51..cb40c821 100644 --- a/.zuul.d/rally-task-telemetry.yaml +++ b/.zuul.d/rally-task-telemetry.yaml @@ -2,16 +2,16 @@ name: rally-task-telemetry parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/heat - name: openstack/ceilometer vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - ceilometer: https://git.openstack.org/openstack/ceilometer + rally-openstack: https://opendev.org/openstack/rally-openstack + ceilometer: https://opendev.org/openstack/ceilometer devstack_services: ceilometer-acentral: true ceilometer-acompute: true diff --git a/.zuul.d/rally-task-watcher.yaml b/.zuul.d/rally-task-watcher.yaml index 43790423..f25a5b53 100644 --- a/.zuul.d/rally-task-watcher.yaml +++ b/.zuul.d/rally-task-watcher.yaml @@ -2,16 +2,16 @@ name: rally-task-watcher parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/watcher - name: openstack/python-watcherclient vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - watcher: https://git.openstack.org/openstack/watcher + rally-openstack: https://opendev.org/openstack/rally-openstack + watcher: https://opendev.org/openstack/watcher devstack_services: watcher-api: true watcher-decision-engine: true diff --git a/.zuul.d/rally-task-zaqar.yaml b/.zuul.d/rally-task-zaqar.yaml index ccf49168..2d624d3a 100644 --- a/.zuul.d/rally-task-zaqar.yaml +++ b/.zuul.d/rally-task-zaqar.yaml @@ -2,14 +2,14 @@ name: rally-task-zaqar parent: rally-task-at-devstack required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate + - name: openstack/devstack + - name: openstack/devstack-gate - name: openstack/rally - name: openstack/rally-openstack - name: openstack/zaqar - name: openstack/python-zaqarclient vars: devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - zaqar: https://git.openstack.org/openstack/zaqar + rally-openstack: https://opendev.org/openstack/rally-openstack + zaqar: https://opendev.org/openstack/zaqar rally_task: rally-jobs/zaqar.yaml diff --git a/.zuul.d/rally-tox-functional.yaml b/.zuul.d/rally-tox-functional.yaml index f483dd56..ad26edeb 100644 --- a/.zuul.d/rally-tox-functional.yaml +++ b/.zuul.d/rally-tox-functional.yaml @@ -1,21 +1,21 @@ -- job: - name: rally-dsvm-tox-functional - parent: devstack - description: - Run functional test for rally-openstack project. - Uses tox with the ``functional`` environment. - required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate - - name: openstack/rally-openstack - # NOTE(andreykurilin): it is a required project to fetch the latest - # version and test master of rally-openstack with master of rally - - name: openstack/rally - timeout: 7200 - roles: - - zuul: openstack-dev/devstack - vars: - devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - rally_tox_env: "functional" - run: tests/ci/playbooks/run-rally-tox.yaml +- job: + name: rally-dsvm-tox-functional + parent: devstack + description: + Run functional test for rally-openstack project. + Uses tox with the ``functional`` environment. + required-projects: + - name: openstack/devstack + - name: openstack/devstack-gate + - name: openstack/rally-openstack + # NOTE(andreykurilin): it is a required project to fetch the latest + # version and test master of rally-openstack with master of rally + - name: openstack/rally + timeout: 7200 + roles: + - zuul: openstack/devstack + vars: + devstack_plugins: + rally-openstack: https://opendev.org/openstack/rally-openstack + rally_tox_env: "functional" + run: tests/ci/playbooks/run-rally-tox.yaml diff --git a/.zuul.d/rally-verify-tempest.yaml b/.zuul.d/rally-verify-tempest.yaml index a76df10d..62f29687 100644 --- a/.zuul.d/rally-verify-tempest.yaml +++ b/.zuul.d/rally-verify-tempest.yaml @@ -1,16 +1,16 @@ -- job: - name: rally-verify-tempest - parent: devstack - required-projects: - - name: openstack-dev/devstack - - name: openstack-infra/devstack-gate - - name: openstack/rally-openstack - - name: openstack/rally - timeout: 7200 - roles: - - zuul: openstack-dev/devstack - vars: - devstack_plugins: - rally-openstack: https://git.openstack.org/openstack/rally-openstack - run: tests/ci/playbooks/run-rally-verify.yaml - post-run: tests/ci/playbooks/post-rally-verify.yaml +- job: + name: rally-verify-tempest + parent: devstack + required-projects: + - name: openstack/devstack + - name: openstack/devstack-gate + - name: openstack/rally-openstack + - name: openstack/rally + timeout: 7200 + roles: + - zuul: openstack/devstack + vars: + devstack_plugins: + rally-openstack: https://opendev.org/openstack/rally-openstack + run: tests/ci/playbooks/run-rally-verify.yaml + post-run: tests/ci/playbooks/post-rally-verify.yaml diff --git a/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml b/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml index 137b865e..218505b1 100644 --- a/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml +++ b/tests/ci/playbooks/roles/check-os-resources/tasks/main.yaml @@ -11,7 +11,7 @@ fi $PYTHON ./tests/ci/osresources.py --compare-with-list {{ rally_resources_at_start }} args: - chdir: "{{ zuul.projects['git.openstack.org/openstack/rally-openstack'].src_dir }}" + chdir: "{{ zuul.projects['opendev.org/openstack/rally-openstack'].src_dir }}" register: command_result - name: Check results of listing resources diff --git a/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml b/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml index d9b38cf2..2f35481d 100644 --- a/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml +++ b/tests/ci/playbooks/roles/fetch-rally-task-results/tasks/main.yaml @@ -10,7 +10,7 @@ fi if [ "$MSG" != "OK" ]; then - sed -i -- "s/var errorMessage = null\;/var errorMessage = \'$MSG\';/g" {{ zuul.projects['git.openstack.org/openstack/rally-openstack'].src_dir }}/tests/ci/pages/task-index.html + sed -i -- "s/var errorMessage = null\;/var errorMessage = \'$MSG\';/g" {{ zuul.projects['opendev.org/openstack/rally-openstack'].src_dir }}/tests/ci/pages/task-index.html fi - name: Check the existence of results dir @@ -52,7 +52,7 @@ - name: Put index.html in the right place become: yes synchronize: - src: "{{ zuul.projects['git.openstack.org/openstack/rally-openstack'].src_dir }}/tests/ci/pages/task-index.html" + src: "{{ zuul.projects['opendev.org/openstack/rally-openstack'].src_dir }}/tests/ci/pages/task-index.html" dest: '{{ zuul.executor.log_root }}/index.html' mode: pull copy_links: true diff --git a/tests/ci/playbooks/roles/snapshot-available-os-resources/tasks/main.yaml b/tests/ci/playbooks/roles/snapshot-available-os-resources/tasks/main.yaml index 9ada954c..45dbe2fa 100644 --- a/tests/ci/playbooks/roles/snapshot-available-os-resources/tasks/main.yaml +++ b/tests/ci/playbooks/roles/snapshot-available-os-resources/tasks/main.yaml @@ -11,4 +11,4 @@ fi $PYTHON ./tests/ci/osresources.py --dump-list {{ rally_resources_at_start }} args: - chdir: "{{ zuul.projects['git.openstack.org/openstack/rally-openstack'].src_dir }}" + chdir: "{{ zuul.projects['opendev.org/openstack/rally-openstack'].src_dir }}"