From aa7106657fb735f3189be2d74dc3bfa22c0cd6f6 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Sun, 24 Mar 2019 20:36:22 +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: Id83a351a8aa24c455f2cd030e01feb776acd0013
---
 etc/turbo-hipster/config.yaml        | 2 +-
 tests/disabled_jjb_runner.py         | 4 ++--
 tests/disabled_shell_task.py         | 8 ++++----
 tests/etc/config.yaml                | 2 +-
 tests/etc/default-config.yaml        | 2 +-
 tests/etc/jjb-config.yaml            | 2 +-
 tests/etc/shutdown-config.yaml       | 2 +-
 turbo_hipster/lib/gerrit-git-prep.sh | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/etc/turbo-hipster/config.yaml b/etc/turbo-hipster/config.yaml
index 5b69b48..9d57865 100644
--- a/etc/turbo-hipster/config.yaml
+++ b/etc/turbo-hipster/config.yaml
@@ -1,6 +1,6 @@
 zuul_server:
   gerrit_site: http://review.openstack.org
-  git_origin: git://git.openstack.org
+  git_origin: https://git.openstack.org
   gearman_host: 119.9.13.90
   gearman_port: 4730
 
diff --git a/tests/disabled_jjb_runner.py b/tests/disabled_jjb_runner.py
index bdcee2d..e5f088c 100644
--- a/tests/disabled_jjb_runner.py
+++ b/tests/disabled_jjb_runner.py
@@ -29,7 +29,7 @@ class TestTaskRunner(base.TestWithGearman):
     def _grab_jjb(self):
         # Grab a copy of JJB's config
         temp_path = self.useFixture(fixtures.TempDir()).path
-        cmd = 'git clone git://git.openstack.org/openstack-infra/config'
+        cmd = 'git clone https://git.openstack.org/openstack-infra/config'
         utils.execute_to_log(cmd, '/dev/null', cwd=temp_path)
         return os.path.join(
             temp_path, 'config',
@@ -57,7 +57,7 @@ class TestTaskRunner(base.TestWithGearman):
             'ZUUL_UUID': job_uuid,
             'ZUUL_PROJECT': 'stackforge/turbo-hipster',
             'ZUUL_PIPELINE': 'check',
-            'ZUUL_URL': 'git://git.openstack.org/',
+            'ZUUL_URL': 'https://git.openstack.org/',
             'BRANCH': 'master',
             'BASE_LOG_PATH': '56/123456/8',
             'LOG_PATH': '56/123456/8/check/job_name/%s' % job_uuid
diff --git a/tests/disabled_shell_task.py b/tests/disabled_shell_task.py
index 7bae862..eb60552 100644
--- a/tests/disabled_shell_task.py
+++ b/tests/disabled_shell_task.py
@@ -36,7 +36,7 @@ class TestTaskRunner(base.TestWithGearman):
             'ZUUL_UUID': job_uuid,
             'ZUUL_PROJECT': 'stackforge/turbo-hipster',
             'ZUUL_PIPELINE': 'check',
-            'ZUUL_URL': 'git://git.openstack.org/',
+            'ZUUL_URL': 'https://git.openstack.org/',
             'BRANCH': 'master',
             'BASE_LOG_PATH': '56/123456/8',
             'LOG_PATH': '56/123456/8/check/job_name/%s' % job_uuid
@@ -84,7 +84,7 @@ class TestTaskRunner(base.TestWithGearman):
             'ZUUL_UUID': job_uuid,
             'ZUUL_PROJECT': 'stackforge/turbo-hipster',
             'ZUUL_PIPELINE': 'check',
-            'ZUUL_URL': 'git://git.openstack.org/',
+            'ZUUL_URL': 'https://git.openstack.org/',
             'BRANCH': 'master',
             'BASE_LOG_PATH': '56/123456/8',
             'LOG_PATH': '56/123456/8/check/job_name/%s' % job_uuid
@@ -148,7 +148,7 @@ class TestTaskRunner(base.TestWithGearman):
             'ZUUL_UUID': job_uuid,
             'ZUUL_PROJECT': 'stackforge/turbo-hipster',
             'ZUUL_PIPELINE': 'check',
-            'ZUUL_URL': 'git://git.openstack.org/',
+            'ZUUL_URL': 'https://git.openstack.org/',
             'BRANCH': 'master',
             'BASE_LOG_PATH': '56/123456/8',
             'LOG_PATH': '56/123456/8/check/job_name/%s' % job_uuid
@@ -209,7 +209,7 @@ class TestTaskRunner(base.TestWithGearman):
             'ZUUL_UUID': job_uuid,
             'ZUUL_PROJECT': 'stackforge/turbo-hipster',
             'ZUUL_PIPELINE': 'check',
-            'ZUUL_URL': 'git://git.openstack.org/',
+            'ZUUL_URL': 'https://git.openstack.org/',
             'BRANCH': 'master',
             'BASE_LOG_PATH': '56/123456/8',
             'LOG_PATH': '56/123456/8/check/job_name/%s' % job_uuid
diff --git a/tests/etc/config.yaml b/tests/etc/config.yaml
index 463405e..0b4230d 100644
--- a/tests/etc/config.yaml
+++ b/tests/etc/config.yaml
@@ -1,6 +1,6 @@
 zuul_server:
   gerrit_site: http://review.openstack.org
-  git_origin: git://git.openstack.org
+  git_origin: https://git.openstack.org
   gearman_host: localhost
   gearman_port: 0
 
diff --git a/tests/etc/default-config.yaml b/tests/etc/default-config.yaml
index da34c46..e2cfa41 100644
--- a/tests/etc/default-config.yaml
+++ b/tests/etc/default-config.yaml
@@ -1,6 +1,6 @@
 zuul_server:
   gerrit_site: http://review.openstack.org
-  git_origin: git://git.openstack.org
+  git_origin: https://git.openstack.org
   gearman_host: localhost
   gearman_port: 0
 
diff --git a/tests/etc/jjb-config.yaml b/tests/etc/jjb-config.yaml
index 542c12e..6a201c1 100644
--- a/tests/etc/jjb-config.yaml
+++ b/tests/etc/jjb-config.yaml
@@ -1,6 +1,6 @@
 zuul_server:
   gerrit_site: http://review.openstack.org
-  git_origin: git://git.openstack.org
+  git_origin: https://git.openstack.org
   gearman_host: localhost
   gearman_port: 0
 
diff --git a/tests/etc/shutdown-config.yaml b/tests/etc/shutdown-config.yaml
index e576202..605efe3 100644
--- a/tests/etc/shutdown-config.yaml
+++ b/tests/etc/shutdown-config.yaml
@@ -1,6 +1,6 @@
 zuul_server:
   gerrit_site: http://review.openstack.org
-  git_origin: git://git.openstack.org
+  git_origin: https://git.openstack.org
   gearman_host: localhost
   gearman_port: 0
 
diff --git a/turbo_hipster/lib/gerrit-git-prep.sh b/turbo_hipster/lib/gerrit-git-prep.sh
index a0b1349..0726275 100755
--- a/turbo_hipster/lib/gerrit-git-prep.sh
+++ b/turbo_hipster/lib/gerrit-git-prep.sh
@@ -20,7 +20,7 @@ fi
 if [ -z "$GIT_ORIGIN" ] || [ -n "$ZUUL_NEWREV" ]
 then
     GIT_ORIGIN="$GERRIT_SITE/p"
-    # git://git.openstack.org/
+    # https://git.openstack.org/
     # https://review.openstack.org/p
 fi