From 4c34a18715e28fed3118c57cd39bcf707eb124a4 Mon Sep 17 00:00:00 2001
From: Xiubo Li <xiubli@redhat.com>
Date: Wed, 23 Nov 2022 13:24:38 +0800
Subject: [PATCH] qa: switch to https protocol for repos' server

Since the git:// is not reachable any more and have switch to
https://.

Signed-off-by: Xiubo Li <xiubli@redhat.com>
---
 qa/machine_types/schedule_subset.sh        |  2 +-
 qa/run_xfstests-obsolete.sh                |  2 +-
 qa/tasks/cephfs/xfstests_dev.py            |  7 +++----
 qa/tasks/restart.py                        | 15 +++++++--------
 qa/workunits/fs/snaps/snaptest-git-ceph.sh |  4 ++--
 qa/workunits/suites/ffsb.sh                |  4 ++--
 qa/workunits/suites/fsx.sh                 |  2 +-
 7 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/qa/machine_types/schedule_subset.sh b/qa/machine_types/schedule_subset.sh
index 6398783c6f8a8f..7f18c81ef6723e 100755
--- a/qa/machine_types/schedule_subset.sh
+++ b/qa/machine_types/schedule_subset.sh
@@ -17,4 +17,4 @@ shift
 # rest of arguments passed directly to teuthology-suite
 
 echo "Scheduling $branch branch"
-teuthology-suite -v -c "$branch" -m "$machine" -k "$kernel" -s "$suite" --ceph-repo git://git.ceph.com/ceph.git --suite-repo git://git.ceph.com/ceph.git --subset "$((RANDOM % partitions))/$partitions" --newest 100 -e "$email" "$@"
+teuthology-suite -v -c "$branch" -m "$machine" -k "$kernel" -s "$suite" --ceph-repo https://git.ceph.com/ceph.git --suite-repo https://git.ceph.com/ceph.git --subset "$((RANDOM % partitions))/$partitions" --newest 100 -e "$email" "$@"
diff --git a/qa/run_xfstests-obsolete.sh b/qa/run_xfstests-obsolete.sh
index 4393c7c866c575..5067996b04dae3 100644
--- a/qa/run_xfstests-obsolete.sh
+++ b/qa/run_xfstests-obsolete.sh
@@ -33,7 +33,7 @@ PROGNAME=$(basename $0)
 
 # xfstests is downloaded from this git repository and then built.
 # XFSTESTS_REPO="git://oss.sgi.com/xfs/cmds/xfstests.git"
-XFSTESTS_REPO="git://git.ceph.com/xfstests.git"
+XFSTESTS_REPO="https://git.ceph.com/xfstests.git"
 
 # Default command line option values
 COUNT="1"
diff --git a/qa/tasks/cephfs/xfstests_dev.py b/qa/tasks/cephfs/xfstests_dev.py
index de1f860d3d9df4..c9902fa9266660 100644
--- a/qa/tasks/cephfs/xfstests_dev.py
+++ b/qa/tasks/cephfs/xfstests_dev.py
@@ -43,12 +43,11 @@ def get_repo(self):
 
         # TODO: make sure that repo is not cloned for every test. it should
         # happen only once.
-        remoteurl = 'git://git.ceph.com/xfstests-dev.git'
+        remoteurl = 'https://git.ceph.com/xfstests-dev.git'
         self.repo_path = self.mount_a.client_remote.mkdtemp(suffix=
                                                             'xfstests-dev')
-        self.mount_a.run_shell(['git', 'archive', '--remote=' + remoteurl,
-                                'HEAD', run.Raw('|'),
-                                'tar', '-C', self.repo_path, '-x', '-f', '-'])
+        self.mount_a.run_shell(['git', 'clone', remoteurl, '--depth', '1',
+                                self.repo_path])
 
     def get_admin_key(self):
         import configparser
diff --git a/qa/tasks/restart.py b/qa/tasks/restart.py
index 716148a7566c1c..d8241f4faaa5f7 100644
--- a/qa/tasks/restart.py
+++ b/qa/tasks/restart.py
@@ -48,17 +48,16 @@ def get_tests(ctx, config, role, remote, testdir):
             'mkdir', '--', srcdir,
             run.Raw('&&'),
             'git',
-            'archive',
-            '--remote=git://git.ceph.com/ceph.git',
-            '%s:qa/workunits' % refspec,
-            run.Raw('|'),
-            'tar',
-            '-C', srcdir,
-            '-x',
-            '-f-',
+            'clone',
+            'https://git.ceph.com/ceph.git',
+            srcdir,
             run.Raw('&&'),
             'cd', '--', srcdir,
             run.Raw('&&'),
+            'git', 'checkout', '-b', 'restart_test', '%s' % refspec,
+            run.Raw('&&'),
+            'cd', '--', 'qa/workunits',
+            run.Raw('&&'),
             'if', 'test', '-e', 'Makefile', run.Raw(';'), 'then', 'make', run.Raw(';'), 'fi',
             run.Raw('&&'),
             'find', '-executable', '-type', 'f', '-printf', r'%P\0',
diff --git a/qa/workunits/fs/snaps/snaptest-git-ceph.sh b/qa/workunits/fs/snaps/snaptest-git-ceph.sh
index d97c15bd95a5d4..12c1f0fdc0036a 100755
--- a/qa/workunits/fs/snaps/snaptest-git-ceph.sh
+++ b/qa/workunits/fs/snaps/snaptest-git-ceph.sh
@@ -8,10 +8,10 @@ trap -- 'retry' EXIT
 retry() {
     rm -rf ceph
     # double the timeout value
-    timeout 3600 git clone git://git.ceph.com/ceph.git
+    timeout 3600 git clone https://git.ceph.com/ceph.git
 }
 rm -rf ceph
-timeout 1800 git clone git://git.ceph.com/ceph.git
+timeout 1800 git clone https://git.ceph.com/ceph.git
 trap - EXIT
 cd ceph
 
diff --git a/qa/workunits/suites/ffsb.sh b/qa/workunits/suites/ffsb.sh
index a6ec7d198af9cd..bf95a05c4e8338 100755
--- a/qa/workunits/suites/ffsb.sh
+++ b/qa/workunits/suites/ffsb.sh
@@ -9,10 +9,10 @@ trap -- 'retry' EXIT
 retry() {
     rm -rf ffsb
     # double the timeout value
-    timeout 3600 git clone git://git.ceph.com/ffsb.git --depth 1
+    timeout 3600 git clone https://git.ceph.com/ffsb.git --depth 1
 }
 rm -rf ffsb
-timeout 1800 git clone git://git.ceph.com/ffsb.git --depth 1
+timeout 1800 git clone https://git.ceph.com/ffsb.git --depth 1
 trap - EXIT
 
 cd ffsb
diff --git a/qa/workunits/suites/fsx.sh b/qa/workunits/suites/fsx.sh
index 813e211dc32e1f..a170baf99416e0 100755
--- a/qa/workunits/suites/fsx.sh
+++ b/qa/workunits/suites/fsx.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-git clone git://git.ceph.com/xfstests.git
+git clone https://git.ceph.com/xfstests.git
 cd xfstests
 git checkout 12973fc04fd10d4af086901e10ffa8e48866b735
 make -j4