“Canonical Kernel Team” team

Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/git-https into ~canonical-kernel-team/+git/autotest-client-tests:master

  1. Git
  2. lp:~canonical-kernel-team/+git/autotest-client-tests
  3. phlin/git-https
  4. Merge into master
Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: 32edace3ba9708ace4be7d9c76f3a32cffe023c2
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:phlin/git-https
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 156 lines (+12/-12)
12 files modified
ubuntu_fs_fio_perf/ubuntu_fs_fio_perf.py (+1/-1)
ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py (+1/-1)
ubuntu_overlayfs_smoke_test/ubuntu_overlayfs_smoke_test.py (+1/-1)
ubuntu_performance_latency/ubuntu_performance_latency.py (+1/-1)
ubuntu_performance_power/ubuntu_performance_power.py (+1/-1)
ubuntu_performance_stress_ng/ubuntu_performance_stress_ng.py (+1/-1)
ubuntu_performance_thermal/ubuntu_performance_thermal.py (+1/-1)
ubuntu_raspberry_pi/ubuntu_raspberry_pi.py (+1/-1)
ubuntu_stress_btrfs/ubuntu_stress_btrfs.py (+1/-1)
ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py (+1/-1)
ubuntu_vfat_stress/ubuntu_vfat_stress.py (+1/-1)
ubuntu_zfs_stress/ubuntu_zfs_stress.py (+1/-1)
Reviewer Review Type Date Requested Status
Sean Feole Approve
Review via email: mp+463890@code.launchpad.net

Commit message

There is a firewall rule change in the Intel lab that prevent us to
run git clone command over git protocol.

Use https protocol instead to prevent hitting this issue in the future.

To post a comment you must log in.
Revision history for this message
Sean Feole (sfeole) wrote :

+1

review: Approve
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

Applied and pushed, thanks!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_fs_fio_perf/ubuntu_fs_fio_perf.py b/ubuntu_fs_fio_perf/ubuntu_fs_fio_perf.py
2index df3920d..082a4b1 100644
3--- a/ubuntu_fs_fio_perf/ubuntu_fs_fio_perf.py
4+++ b/ubuntu_fs_fio_perf/ubuntu_fs_fio_perf.py
5@@ -112,7 +112,7 @@ class ubuntu_fs_fio_perf(test.test):
6
7 os.chdir(self.srcdir)
8 utils.system('rm -rf fs-test-proto')
9- utils.system('git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/fs-test-proto')
10+ utils.system('git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/fs-test-proto')
11 # Print test suite HEAD SHA1 commit id for future reference
12 os.chdir(os.path.join(self.srcdir, 'fs-test-proto'))
13 sha1 = None
14diff --git a/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py b/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py
15index ed1457d..8d6c096 100644
16--- a/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py
17+++ b/ubuntu_ltp_syscalls/ubuntu_ltp_syscalls.py
18@@ -86,7 +86,7 @@ class ubuntu_ltp_syscalls(test.test):
19 branch = 'sru-' + self.series
20 print("Use a fixed branch for ESM series - {}".format(branch))
21
22- cmd = 'git clone -b {} --depth 1 git://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
23+ cmd = 'git clone -b {} --depth 1 https://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
24 utils.system_output(cmd, retain_output=True)
25
26 # Print test suite HEAD SHA1 commit id for future reference
27diff --git a/ubuntu_overlayfs_smoke_test/ubuntu_overlayfs_smoke_test.py b/ubuntu_overlayfs_smoke_test/ubuntu_overlayfs_smoke_test.py
28index 2ec957f..d64c008 100644
29--- a/ubuntu_overlayfs_smoke_test/ubuntu_overlayfs_smoke_test.py
30+++ b/ubuntu_overlayfs_smoke_test/ubuntu_overlayfs_smoke_test.py
31@@ -4,7 +4,7 @@ from autotest.client import test, utils
32 import os
33 import shutil
34
35-TEST_REPOSITORY = 'git://git.launchpad.net/~canonical-kernel-team/+git/overlay-shiftfs-tests'
36+TEST_REPOSITORY = 'https://git.launchpad.net/~canonical-kernel-team/+git/overlay-shiftfs-tests'
37 TEST_BRANCH = 'main'
38 TEST_DIR = 'overlay-shiftfs-tests'
39
40diff --git a/ubuntu_performance_latency/ubuntu_performance_latency.py b/ubuntu_performance_latency/ubuntu_performance_latency.py
41index bc3b79c..b67eeda 100644
42--- a/ubuntu_performance_latency/ubuntu_performance_latency.py
43+++ b/ubuntu_performance_latency/ubuntu_performance_latency.py
44@@ -110,7 +110,7 @@ class ubuntu_performance_latency(test.test):
45 self.job.require_gcc()
46 os.chdir(self.srcdir)
47 shutil.rmtree('stress-ng', ignore_errors=True)
48- self.results = utils.system_output('git clone git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
49+ self.results = utils.system_output('git clone https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
50 os.chdir(os.path.join(self.srcdir, 'stress-ng'))
51 self.results = utils.system_output('git checkout -b V0.09.56 V0.09.56', retain_output=True)
52 self.results = utils.system_output('patch -p1 < %s/0001-Add-build-time-check-for-struct-sockaddr_un.patch' % self.bindir, retain_output=True)
53diff --git a/ubuntu_performance_power/ubuntu_performance_power.py b/ubuntu_performance_power/ubuntu_performance_power.py
54index b5d995b..026ad80 100644
55--- a/ubuntu_performance_power/ubuntu_performance_power.py
56+++ b/ubuntu_performance_power/ubuntu_performance_power.py
57@@ -97,7 +97,7 @@ class ubuntu_performance_power(test.test):
58 self.job.require_gcc()
59 os.chdir(self.srcdir)
60 shutil.rmtree('stress-ng', ignore_errors=True)
61- self.results = utils.system_output('git clone git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
62+ self.results = utils.system_output('git clone https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
63 os.chdir(os.path.join(self.srcdir, 'stress-ng'))
64 self.results = utils.system_output('git checkout -b V0.09.56 V0.09.56', retain_output=True)
65 self.results = utils.system_output('make', retain_output=True)
66diff --git a/ubuntu_performance_stress_ng/ubuntu_performance_stress_ng.py b/ubuntu_performance_stress_ng/ubuntu_performance_stress_ng.py
67index c196385..de7dc9e 100644
68--- a/ubuntu_performance_stress_ng/ubuntu_performance_stress_ng.py
69+++ b/ubuntu_performance_stress_ng/ubuntu_performance_stress_ng.py
70@@ -110,7 +110,7 @@ class ubuntu_performance_stress_ng(test.test):
71 self.job.require_gcc()
72 os.chdir(self.srcdir)
73 shutil.rmtree('stress-ng', ignore_errors=True)
74- self.results = utils.system_output('git clone git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
75+ self.results = utils.system_output('git clone https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
76 os.chdir(os.path.join(self.srcdir, 'stress-ng'))
77 self.results = utils.system_output('git checkout -b V0.09.56 V0.09.56', retain_output=True)
78 self.results = utils.system_output('patch -p1 < %s/0001-Add-build-time-check-for-struct-sockaddr_un.patch' % self.bindir, retain_output=True)
79diff --git a/ubuntu_performance_thermal/ubuntu_performance_thermal.py b/ubuntu_performance_thermal/ubuntu_performance_thermal.py
80index 6da520e..d443724 100644
81--- a/ubuntu_performance_thermal/ubuntu_performance_thermal.py
82+++ b/ubuntu_performance_thermal/ubuntu_performance_thermal.py
83@@ -95,7 +95,7 @@ class ubuntu_performance_thermal(test.test):
84 self.job.require_gcc()
85 os.chdir(self.srcdir)
86 shutil.rmtree('stress-ng', ignore_errors=True)
87- self.results = utils.system_output('git clone git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
88+ self.results = utils.system_output('git clone https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng', retain_output=True)
89 os.chdir(os.path.join(self.srcdir, 'stress-ng'))
90 self.results = utils.system_output('git checkout -b V0.09.56 V0.09.56', retain_output=True)
91 self.results = utils.system_output('patch -p1 < %s/0001-Add-build-time-check-for-struct-sockaddr_un.patch' % self.bindir, retain_output=True)
92diff --git a/ubuntu_raspberry_pi/ubuntu_raspberry_pi.py b/ubuntu_raspberry_pi/ubuntu_raspberry_pi.py
93index 6cb874a..28e3fc3 100644
94--- a/ubuntu_raspberry_pi/ubuntu_raspberry_pi.py
95+++ b/ubuntu_raspberry_pi/ubuntu_raspberry_pi.py
96@@ -6,7 +6,7 @@ import shutil
97 from autotest.client import test, utils
98 from autotest.client.shared import error
99
100-TEST_REPOSITORY = 'git://git.launchpad.net/~canonical-kernel-team/+git/raspi-rt-tests'
101+TEST_REPOSITORY = 'https://git.launchpad.net/~canonical-kernel-team/+git/raspi-rt-tests'
102
103
104 class ubuntu_raspberry_pi(test.test):
105diff --git a/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py b/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py
106index 901f93d..a1a25d5 100644
107--- a/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py
108+++ b/ubuntu_stress_btrfs/ubuntu_stress_btrfs.py
109@@ -47,7 +47,7 @@ class ubuntu_stress_btrfs(test.test):
110 utils.system('cp %s/ubuntu_stress_btrfs.sh %s' % (self.bindir, self.srcdir))
111 os.chdir(self.srcdir)
112 shutil.rmtree('stress-ng', ignore_errors=True)
113- cmd = 'git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
114+ cmd = 'git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
115 self.results = utils.system_output(cmd, retain_output=True)
116
117 # Print test suite HEAD SHA1 commit id for future reference
118diff --git a/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py b/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py
119index ca02c17..cd93439 100644
120--- a/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py
121+++ b/ubuntu_stress_btrfs_cmd/ubuntu_stress_btrfs_cmd.py
122@@ -48,7 +48,7 @@ class ubuntu_stress_btrfs_cmd(test.test):
123 utils.system('cp %s/ubuntu_stress_btrfs_cmd.sh %s' % (self.bindir, self.srcdir))
124 os.chdir(self.srcdir)
125 shutil.rmtree('stress-ng', ignore_errors=True)
126- cmd = 'git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
127+ cmd = 'git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
128 self.results = utils.system_output(cmd, retain_output=True)
129
130 # Print test suite HEAD SHA1 commit id for future reference
131diff --git a/ubuntu_vfat_stress/ubuntu_vfat_stress.py b/ubuntu_vfat_stress/ubuntu_vfat_stress.py
132index 7cfcb48..115a559 100644
133--- a/ubuntu_vfat_stress/ubuntu_vfat_stress.py
134+++ b/ubuntu_vfat_stress/ubuntu_vfat_stress.py
135@@ -49,7 +49,7 @@ class ubuntu_vfat_stress(test.test):
136 utils.system('cp %s/ubuntu_vfat_stress.sh %s' % (self.bindir, self.srcdir))
137 os.chdir(self.srcdir)
138 shutil.rmtree('stress-ng', ignore_errors=True)
139- cmd = 'git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
140+ cmd = 'git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
141 self.results = utils.system_output(cmd, retain_output=True)
142
143 # Print test suite HEAD SHA1 commit id for future reference
144diff --git a/ubuntu_zfs_stress/ubuntu_zfs_stress.py b/ubuntu_zfs_stress/ubuntu_zfs_stress.py
145index 569792f..375c417 100644
146--- a/ubuntu_zfs_stress/ubuntu_zfs_stress.py
147+++ b/ubuntu_zfs_stress/ubuntu_zfs_stress.py
148@@ -47,7 +47,7 @@ class ubuntu_zfs_stress(test.test):
149 utils.system('cp %s/ubuntu_zfs_stress.sh %s' % (self.bindir, self.srcdir))
150 os.chdir(self.srcdir)
151 shutil.rmtree('stress-ng', ignore_errors=True)
152- cmd = 'git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
153+ cmd = 'git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
154 self.results = utils.system_output(cmd, retain_output=True)
155
156 # Print test suite HEAD SHA1 commit id for future reference

Subscribers

People subscribed via source and target branches

to all changes: