diff --git a/.gitreview b/.gitreview index 1c773e0e5e9..4b0e68e7425 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/queens diff --git a/.zuul.yaml b/.zuul.yaml index 320cbb646c9..1c0438008bf 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -146,7 +146,7 @@ post-run: playbooks/legacy/neutron-functional/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron irrelevant-files: - ^.*\.rst$ @@ -161,7 +161,7 @@ post-run: playbooks/legacy/neutron-fullstack/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron irrelevant-files: - ^.*\.rst$ @@ -177,7 +177,7 @@ post-run: playbooks/legacy/neutron-rally-neutron/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/aodh - openstack/ceilometer - openstack/diskimage-builder @@ -215,7 +215,7 @@ post-run: playbooks/legacy/neutron-tempest-dvr/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest irrelevant-files: @@ -236,7 +236,7 @@ post-run: playbooks/legacy/neutron-tempest-linuxbridge/post.yaml timeout: 8400 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest irrelevant-files: @@ -258,8 +258,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 nodeset: ubuntu-xenial-2-node irrelevant-files: @@ -280,8 +280,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 nodeset: ubuntu-xenial-2-node irrelevant-files: @@ -302,7 +302,7 @@ post-run: playbooks/legacy/neutron-tempest-multinode-full/post.yaml timeout: 10800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest nodeset: ubuntu-xenial-2-node @@ -325,7 +325,7 @@ post-run: playbooks/legacy/neutron-tempest-dvr-ha-multinode-full/post.yaml timeout: 10800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest nodeset: ubuntu-xenial-3-node @@ -348,7 +348,7 @@ post-run: playbooks/legacy/neutron-tempest-ovsfw/post.yaml timeout: 7800 required-projects: - - openstack-infra/devstack-gate + - openstack/devstack-gate - openstack/neutron - openstack/tempest irrelevant-files: @@ -370,8 +370,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: - ^(test-|)requirements.txt$ diff --git a/playbooks/legacy/neutron-fullstack/run.yaml b/playbooks/legacy/neutron-fullstack/run.yaml index 7f2d271901f..c13d6d7aaca 100644 --- a/playbooks/legacy/neutron-fullstack/run.yaml +++ b/playbooks/legacy/neutron-fullstack/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 }}' diff --git a/playbooks/legacy/neutron-functional/run.yaml b/playbooks/legacy/neutron-functional/run.yaml index 6a5779b48d9..2c9819e9c9e 100644 --- a/playbooks/legacy/neutron-functional/run.yaml +++ b/playbooks/legacy/neutron-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' environment: '{{ zuul | zuul_legacy_vars }}' diff --git a/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml b/playbooks/legacy/neutron-grenade-dvr-multinode/run.yaml index 8001f6953a9..348aae62e76 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 \ - 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 }}' @@ -32,7 +32,7 @@ export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_GRENADE=pullup # 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 b99d83f1181..e93d0c3b38f 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 \ - 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,7 +31,7 @@ export DEVSTACK_GATE_NEUTRON=1 export DEVSTACK_GATE_CONFIGDRIVE=0 export DEVSTACK_GATE_GRENADE=pullup - 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 6ba1edb44bc..9b26a9be162 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 \ - 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 }}' @@ -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-rally-neutron/run.yaml b/playbooks/legacy/neutron-rally-neutron/run.yaml index 14bb8072896..1b115dd6150 100644 --- a/playbooks/legacy/neutron-rally-neutron/run.yaml +++ b/playbooks/legacy/neutron-rally-neutron/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 }}' @@ -58,7 +58,7 @@ export IDENTITY_API_VERSION=3 fi - DEVSTACK_LOCAL_CONFIG="enable_plugin rally https://git.openstack.org/openstack/rally" + DEVSTACK_LOCAL_CONFIG="enable_plugin rally https://opendev.org/openstack/rally" DEVSTACK_LOCAL_CONFIG+=$'\n'"CINDER_ENABLE_V1_API=True" DEVSTACK_LOCAL_CONFIG+=$'\n'"IDENTITY_API_VERSION=$IDENTITY_API_VERSION" @@ -79,11 +79,11 @@ fi if [ $DEVSTACK_GATE_HEAT -ne 0 ]; then - 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" fi export PROJECTS="openstack/neutron $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron https://git.openstack.org/openstack/neutron" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron https://opendev.org/openstack/neutron" if [ $DEVSTACK_GATE_NEUTRON_EXTENSIONS -ne 0 ]; then export PROJECTS="openstack/neutron-lbaas $PROJECTS" export PROJECTS="openstack/octavia $PROJECTS" @@ -92,42 +92,42 @@ export PROJECTS="openstack/tripleo-image-elements $PROJECTS" export PROJECTS="openstack/neutron-vpnaas $PROJECTS" export PROJECTS="openstack/networking-bgpvpn $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://git.openstack.org/openstack/neutron-lbaas" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://git.openstack.org/openstack/octavia" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas https://git.openstack.org/openstack/neutron-fwaas" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas https://git.openstack.org/openstack/neutron-vpnaas" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-bgpvpn https://git.openstack.org/openstack/networking-bgpvpn.git" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-lbaas https://opendev.org/openstack/neutron-lbaas" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin octavia https://opendev.org/openstack/octavia" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-fwaas https://opendev.org/openstack/neutron-fwaas" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin neutron-vpnaas https://opendev.org/openstack/neutron-vpnaas" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin networking-bgpvpn https://opendev.org/openstack/networking-bgpvpn.git" export ENABLED_SERVICES+=q-lbaasv2,octavia,o-cw,o-hk,o-hm,o-api,q-fwaas,q-svc,q-agt,q-dhcp,q-l3,q-meta, fi if [ $DEVSTACK_GATE_IRONIC -ne 0 ]; then export PROJECTS="openstack/ironic $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic https://git.openstack.org/openstack/ironic" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic https://opendev.org/openstack/ironic" fi if [ $DEVSTACK_GATE_ZAQAR -ne 0 ]; then export PROJECTS="openstack/python-zaqarclient $PROJECTS" export PROJECTS="openstack/zaqar-ui $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar https://git.openstack.org/openstack/zaqar" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin zaqar https://opendev.org/openstack/zaqar" fi if [ $DEVSTACK_GATE_SENLIN -ne 0 ]; then export PROJECTS="openstack/senlin $PROJECTS" export PROJECTS="openstack/python-senlinclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin senlin https://git.openstack.org/openstack/senlin" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin senlin https://opendev.org/openstack/senlin" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service sl-api sl-eng" fi if [ $DEVSTACK_GATE_WATCHER -ne 0 ]; then export PROJECTS="openstack/watcher $PROJECTS" export PROJECTS="openstack/python-watcherclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin watcher https://git.openstack.org/openstack/watcher" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin watcher https://opendev.org/openstack/watcher" export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service watcher-api watcher-decision-engine watcher-applier" fi if [ $DEVSTACK_GATE_MAGNUM -ne 0 ]||[ $RALLY_SCENARIO = "magnum" ]; then export PROJECTS="openstack/magnum $PROJECTS" export PROJECTS="openstack/python-magnumclient $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum https://git.openstack.org/openstack/magnum" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum https://opendev.org/openstack/magnum" fi if [ $DEVSTACK_GATE_TELEMETRY -ne 0 ]; then export PROJECTS="openstack/panko $PROJECTS" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko https://git.openstack.org/openstack/panko" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko https://opendev.org/openstack/panko" export ENABLED_SERVICES+=panko-api, export PROJECTS="openstack/ceilometer $PROJECTS" export PROJECTS="openstack/aodh $PROJECTS" @@ -135,9 +135,9 @@ export CEILOMETER_NOTIFICATION_TOPICS=notifications,profiler - 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 gnocchi https://git.openstack.org/openstack/gnocchi" + 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 gnocchi https://opendev.org/openstack/gnocchi" export ENABLED_SERVICES+=ceilometer-acompute,ceilometer-acentral,ceilometer-api, export ENABLED_SERVICES+=ceilometer-anotification,ceilometer-collector, export ENABLED_SERVICES+=aodh-api,aodh-evaluator,aodh-notifier, diff --git a/playbooks/legacy/neutron-tempest-dvr-ha-multinode-full/run.yaml b/playbooks/legacy/neutron-tempest-dvr-ha-multinode-full/run.yaml index 0451964355a..058fccb6c73 100644 --- a/playbooks/legacy/neutron-tempest-dvr-ha-multinode-full/run.yaml +++ b/playbooks/legacy/neutron-tempest-dvr-ha-multinode-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 \ - 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 }}' diff --git a/playbooks/legacy/neutron-tempest-dvr/run.yaml b/playbooks/legacy/neutron-tempest-dvr/run.yaml index a6f48914117..1509212b4e1 100644 --- a/playbooks/legacy/neutron-tempest-dvr/run.yaml +++ b/playbooks/legacy/neutron-tempest-dvr/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 }}' diff --git a/playbooks/legacy/neutron-tempest-linuxbridge/run.yaml b/playbooks/legacy/neutron-tempest-linuxbridge/run.yaml index 969faadfcc0..74a8f64bf85 100644 --- a/playbooks/legacy/neutron-tempest-linuxbridge/run.yaml +++ b/playbooks/legacy/neutron-tempest-linuxbridge/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 }}' diff --git a/playbooks/legacy/neutron-tempest-multinode-full/run.yaml b/playbooks/legacy/neutron-tempest-multinode-full/run.yaml index da2d9ea24b3..a483d445cbc 100644 --- a/playbooks/legacy/neutron-tempest-multinode-full/run.yaml +++ b/playbooks/legacy/neutron-tempest-multinode-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 \ - 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 }}' diff --git a/playbooks/legacy/neutron-tempest-ovsfw/run.yaml b/playbooks/legacy/neutron-tempest-ovsfw/run.yaml index 662faaf229b..7d4eec80223 100644 --- a/playbooks/legacy/neutron-tempest-ovsfw/run.yaml +++ b/playbooks/legacy/neutron-tempest-ovsfw/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 }}'