From 6777ba5640b5be87fe48561f9a8a63403b7d9d95 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Sun, 24 Mar 2019 20:34:06 +0000 Subject: [PATCH] Replace openstack.org git:// URLs with https:// This is a mechanically generated change to replace openstack.org git:// URLs with https:// equivalents. This is in aid of a planned future move of the git hosting infrastructure to a self-hosted instance of gitea (https://gitea.io), which does not support the git wire protocol at this stage. This update should result in no functional change. For more information see the thread at http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003825.html Change-Id: Ib95fb6956f32d1c663bd95df2732af85f172fcba --- doc/source/admin/troubleshooting-guide.rst | 6 +++--- magnum/tests/contrib/gate_hook.sh | 6 +++--- playbooks/magnum-buildimages-base.yaml | 2 +- playbooks/magnum-tox-migration.yaml | 2 +- playbooks/pre/prepare-workspace.yaml | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/doc/source/admin/troubleshooting-guide.rst b/doc/source/admin/troubleshooting-guide.rst index 3931dd367d..d9107b4ead 100644 --- a/doc/source/admin/troubleshooting-guide.rst +++ b/doc/source/admin/troubleshooting-guide.rst @@ -760,7 +760,7 @@ Simulating gate tests dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ + https://git.openstack.org \ openstack-infra/devstack-gate export PYTHONUNBUFFERED=true export DEVSTACK_GATE_TIMEOUT=240 # bump this if you see timeout issues. Default is 120 @@ -775,8 +775,8 @@ Simulating gate tests export PROJECTS="openstack/magnum $PROJECTS" export PROJECTS="openstack/python-magnumclient $PROJECTS" export PROJECTS="openstack/barbican $PROJECTS" - export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum git://git.openstack.org/openstack/magnum" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG="enable_plugin magnum https://git.openstack.org/openstack/magnum" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer https://git.openstack.org/openstack/ceilometer" # Keep localrc to be able to set some vars in post_test_hook export KEEP_LOCALRC=1 function gate_hook { diff --git a/magnum/tests/contrib/gate_hook.sh b/magnum/tests/contrib/gate_hook.sh index f035989e21..d58ea06069 100755 --- a/magnum/tests/contrib/gate_hook.sh +++ b/magnum/tests/contrib/gate_hook.sh @@ -19,7 +19,7 @@ coe=$1 special=$2 export PROJECTS="openstack/barbican $PROJECTS" -export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat" +export DEVSTACK_LOCAL_CONFIG="enable_plugin heat https://git.openstack.org/openstack/heat" export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon" export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account" @@ -55,7 +55,7 @@ elif [ "${coe}${special}" = "k8s-ironic" ]; then # NOTE(strigazi) keep cinder # export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service cinder c-sch c-api c-vol" - export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic https://git.openstack.org/openstack/ironic" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEPLOY_DRIVER=pxe_ipmitool" # NOTE(ykarel) Ironic to work with magnum, requires devstack to be configured with IP_VERSION=4 @@ -90,6 +90,6 @@ else fi # Enable magnum plugin in the last step -export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum git://git.openstack.org/openstack/magnum" +export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin magnum https://git.openstack.org/openstack/magnum" $BASE/new/devstack-gate/devstack-vm-gate.sh diff --git a/playbooks/magnum-buildimages-base.yaml b/playbooks/magnum-buildimages-base.yaml index f8aea51e66..069371a996 100644 --- a/playbooks/magnum-buildimages-base.yaml +++ b/playbooks/magnum-buildimages-base.yaml @@ -15,7 +15,7 @@ fi /usr/zuul-env/bin/zuul-cloner --cache-dir /opt/git \ - git://git.openstack.org \ + https://git.openstack.org \ openstack/diskimage-builder \ openstack/dib-utils \ openstack/magnum $EXTRA_PROJECTS diff --git a/playbooks/magnum-tox-migration.yaml b/playbooks/magnum-tox-migration.yaml index bd415b753d..34ba89bc43 100644 --- a/playbooks/magnum-tox-migration.yaml +++ b/playbooks/magnum-tox-migration.yaml @@ -31,7 +31,7 @@ EOF fi /usr/zuul-env/bin/zuul-cloner -m $CLONEMAP --cache-dir /opt/git \ - git://git.openstack.org $ZUUL_PROJECT openstack/requirements + https://git.openstack.org $ZUUL_PROJECT openstack/requirements # REQS_DIR is not set for openstack/requirements and there is also # no need to copy in this case. if [[ "$ZUUL_PROJECT" != "openstack/requirements" ]]; then diff --git a/playbooks/pre/prepare-workspace.yaml b/playbooks/pre/prepare-workspace.yaml index 412a04a755..c2bb5d0339 100644 --- a/playbooks/pre/prepare-workspace.yaml +++ b/playbooks/pre/prepare-workspace.yaml @@ -16,7 +16,7 @@ dest: devstack-gate EOF /usr/zuul-env/bin/zuul-cloner -m clonemap.yaml --cache-dir /opt/git \ - git://git.openstack.org \ + https://git.openstack.org \ openstack-infra/devstack-gate executable: /bin/bash chdir: '{{ ansible_user_dir }}/workspace'