From 4038fa46043ee6e611d83c86b136388eb1bb90f6 Mon Sep 17 00:00:00 2001 From: OpenDev Sysadmins Date: Fri, 19 Apr 2019 19:30:29 +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 | 12 ++++++------ .../legacy/keystone-dsvm-grenade-multinode/run.yaml | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitreview b/.gitreview index cd914fe02a..e8ebbd0e6a 100644 --- a/.gitreview +++ b/.gitreview @@ -1,4 +1,4 @@ [gerrit] -host=review.openstack.org +host=review.opendev.org port=29418 project=openstack/keystone.git diff --git a/.zuul.yaml b/.zuul.yaml index 8b3cd6a953..547d423f1a 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -15,7 +15,7 @@ parent: devstack-tempest timeout: 4200 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/keystone - openstack/keystone-tempest-plugin vars: @@ -43,7 +43,7 @@ keystone-saml2-federation: true tls-proxy: false devstack_plugins: - keystone: https://git.openstack.org/openstack/keystone + keystone: https://opendev.org/openstack/keystone zuul_copy_output: /etc/shibboleth: logs @@ -87,8 +87,8 @@ post-run: playbooks/legacy/keystone-dsvm-grenade-multinode/post.yaml timeout: 10800 required-projects: - - openstack-dev/grenade - - openstack-infra/devstack-gate + - openstack/grenade + - openstack/devstack-gate - openstack/keystone # Experimental @@ -103,7 +103,7 @@ keystone-saml2-federation: true tls-proxy: false devstack_plugins: - keystone: https://git.openstack.org/openstack/keystone + keystone: https://opendev.org/openstack/keystone zuul_copy_output: /etc/shibboleth: logs @@ -119,7 +119,7 @@ keystone-saml2-federation: true tls-proxy: false devstack_plugins: - keystone: https://git.openstack.org/openstack/keystone + keystone: https://opendev.org/openstack/keystone zuul_copy_output: /etc/shibboleth: logs diff --git a/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml b/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml index ba5f3c1cab..83131cec5b 100644 --- a/playbooks/legacy/keystone-dsvm-grenade-multinode/run.yaml +++ b/playbooks/legacy/keystone-dsvm-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 \ - 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 }}' @@ -31,14 +31,14 @@ export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_GRENADE=pullup - export PROJECTS="openstack-dev/grenade $PROJECTS" + export PROJECTS="openstack/grenade $PROJECTS" export BRANCH_OVERRIDE=default if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi export DEVSTACK_GATE_TOPOLOGY="multinode" export MULTI_KEYSTONE=1 - export DEVSTACK_LOCAL_CONFIG="enable_plugin keystone https://git.openstack.org/openstack/keystone" + export DEVSTACK_LOCAL_CONFIG="enable_plugin keystone https://opendev.org/openstack/keystone" export DEVSTACK_LOCAL_CONFIG+=$'\n'"MULTI_KEYSTONE=1" cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh