From 5782ce4c5a9d9432b8d929340221cdebdbc1e6d0 Mon Sep 17 00:00:00 2001 From: OpenDev Sysadmins Date: Fri, 19 Apr 2019 19:33:28 +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 | 8 ++++---- playbooks/devstack/functional/run.yaml | 22 +++++++++++----------- playbooks/devstack/grenade/run.yaml | 12 ++++++------ 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.gitreview b/.gitreview index 73add9f8c8..a71b071e0e 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/heat.git diff --git a/.zuul.yaml b/.zuul.yaml index 15aaf0cdfa..ea49450877 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -5,7 +5,7 @@ post-run: playbooks/devstack/functional/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/aodh - openstack/barbican - openstack/barbican-tempest-plugin @@ -74,8 +74,8 @@ post-run: playbooks/devstack/functional/post.yaml timeout: 7800 required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate + - openstack/grenade + - openstack/devstack-gate - openstack/heat - openstack/heat-tempest-plugin irrelevant-files: @@ -96,7 +96,7 @@ parent: grenade-heat nodeset: ubuntu-bionic-2-node roles: - - zuul: openstack-infra/zuul-jobs + - zuul: zuul/zuul-jobs pre-run: playbooks/devstack/multinode-networking/pre.yaml vars: topology: multinode diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml index f0e835077c..80648ddab3 100644 --- a/playbooks/devstack/functional/run.yaml +++ b/playbooks/devstack/functional/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 \ - https://git.openstack.org \ - openstack-infra/devstack-gate + https://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' @@ -55,15 +55,15 @@ export PROJECTS="openstack/heat-agents $PROJECTS" export PROJECTS="openstack/python-zaqarclient $PROJECTS" export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh https://git.openstack.org/openstack/aodh" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar https://git.openstack.org/openstack/zaqar" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron https://git.openstack.org/openstack/neutron" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://opendev.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh https://opendev.org/openstack/aodh" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar https://opendev.org/openstack/zaqar" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron https://opendev.org/openstack/neutron" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://git.openstack.org/openstack/heat" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat https://opendev.org/openstack/heat" # Enable octavia plugin and services - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://opendev.org/openstack/octavia" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_FILE=/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_SIZE=3" export DEVSTACK_LOCAL_CONFIG+=$'\n'"OCTAVIA_AMP_IMAGE_NAME=test-only-amphora-x64-haproxy-ubuntu-bionic" @@ -76,7 +76,7 @@ export PROJECTS="openstack/barbican $PROJECTS" export PROJECTS="openstack/python-barbicanclient $PROJECTS" export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://git.openstack.org/openstack/barbican" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin barbican https://opendev.org/openstack/barbican" # use heat-tempest-plugin export PROJECTS="openstack/heat-tempest-plugin $PROJECTS" @@ -93,7 +93,7 @@ if [ "{{ use_amqp1 }}" -eq 1 ] ; then export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS" export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 https://git.openstack.org/openstack/devstack-plugin-amqp1" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 https://opendev.org/openstack/devstack-plugin-amqp1" export DEVSTACK_LOCAL_CONFIG+=$'\n'"export CELLSV2_SETUP=singleconductor" export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging,$DEVSTACK_PROJECT_FROM_GIT" fi diff --git a/playbooks/devstack/grenade/run.yaml b/playbooks/devstack/grenade/run.yaml index e0064dfce7..ec2ee28b80 100644 --- a/playbooks/devstack/grenade/run.yaml +++ b/playbooks/devstack/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 \ - https://git.openstack.org \ - openstack-infra/devstack-gate + https://opendev.org \ + openstack/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace' environment: '{{ zuul | zuul_legacy_vars }}' @@ -29,7 +29,7 @@ set -x cat << 'EOF' >>"/tmp/dg-local.conf" [[local|localrc]] - enable_plugin heat https://git.openstack.org/openstack/heat + enable_plugin heat https://opendev.org/openstack/heat TEMPEST_PLUGINS+=' ../heat-tempest-plugin' EOF executable: /bin/bash @@ -40,10 +40,10 @@ cmd: | set -e set -x - export PROJECTS="openstack-dev/grenade $PROJECTS" + export PROJECTS="openstack/grenade $PROJECTS" export PROJECTS="openstack/heat-tempest-plugin $PROJECTS" export PYTHONUNBUFFERED=true - export GRENADE_PLUGINRC="enable_grenade_plugin heat https://git.openstack.org/openstack/heat" + export GRENADE_PLUGINRC="enable_grenade_plugin heat https://opendev.org/openstack/heat" export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1