diff options
Diffstat (limited to 'playbooks')
-rw-r--r-- | playbooks/devstack/functional/run.yaml | 22 | ||||
-rw-r--r-- | playbooks/devstack/grenade/run.yaml | 12 |
2 files changed, 17 insertions, 17 deletions
diff --git a/playbooks/devstack/functional/run.yaml b/playbooks/devstack/functional/run.yaml index f0e835077..80648ddab 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 e0064dfce..ec2ee28b8 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 |