“Canonical Kernel Team” team

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

  1. Git
  2. lp:~canonical-kernel-team/+git/autotest-client-tests
  3. phlin/ps5-git-https
  4. Merge into master
Proposed by Po-Hsu Lin
Status: Merged
Merge reported by: Po-Hsu Lin
Merged at revision: 60daa6a7dd6294c300adde5f875d1cf920afbde8
Proposed branch: ~canonical-kernel-team/+git/autotest-client-tests:phlin/ps5-git-https
Merge into: ~canonical-kernel-team/+git/autotest-client-tests:master
Diff against target: 91 lines (+7/-7)
7 files modified
ubuntu_ltp/ubuntu_ltp.py (+1/-1)
ubuntu_ltp_controllers/ubuntu_ltp_controllers.py (+1/-1)
ubuntu_ltp_cve/ubuntu_ltp_cve.py (+1/-1)
ubuntu_ltp_kernel_misc/ubuntu_ltp_kernel_misc.py (+1/-1)
ubuntu_ltp_stable/ubuntu_ltp_stable.py (+1/-1)
ubuntu_ramfs_stress/ubuntu_ramfs_stress.py (+1/-1)
ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py (+1/-1)
Reviewer Review Type Date Requested Status
Cory Todd (community) Approve
Sean Feole Approve
Review via email: mp+431723@code.launchpad.net

Commit message

When trying to run tests on PS5, the git protocol is not working even
with proxy enabled because of our firewall rule.

Convert the protocol from git to https for selected tests. This
change should not cause any problem to our current SRU as we have
already been using both git and https protocol for git clone command.

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

+1 lgtm!

review: Approve
Revision history for this message
Cory Todd (corytodd) wrote :

+1 lgtm

Another alternative would be to use the url.insteadof gitconfig. Something like

[url "https://git.launchpad.net/"]
    insteadof = git://git.launchpad.net/

would be opt-in per PS5 host instead of affecting production code.

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

Thanks Cory,
didn't think of that gitconfig, maybe we can add that to CKCT in the future when needed. So that we don't need to modify each test case like this.

Applied and pushed.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/ubuntu_ltp/ubuntu_ltp.py b/ubuntu_ltp/ubuntu_ltp.py
2index cfe5518..e7f6280 100644
3--- a/ubuntu_ltp/ubuntu_ltp.py
4+++ b/ubuntu_ltp/ubuntu_ltp.py
5@@ -62,7 +62,7 @@ class ubuntu_ltp(test.test):
6 os.chdir(self.srcdir)
7 shutil.rmtree('ltp', ignore_errors=True)
8 branch = 'sru'
9- cmd = 'git clone -b {} git://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
10+ cmd = 'git clone -b {} https://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
11 utils.system_output(cmd, retain_output=True)
12
13 # Print test suite HEAD SHA1 commit id for future reference
14diff --git a/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py b/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py
15index b5328b9..3eddb9c 100644
16--- a/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py
17+++ b/ubuntu_ltp_controllers/ubuntu_ltp_controllers.py
18@@ -86,7 +86,7 @@ class ubuntu_ltp_controllers(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_ltp_cve/ubuntu_ltp_cve.py b/ubuntu_ltp_cve/ubuntu_ltp_cve.py
28index 3647578..b4dd5a3 100644
29--- a/ubuntu_ltp_cve/ubuntu_ltp_cve.py
30+++ b/ubuntu_ltp_cve/ubuntu_ltp_cve.py
31@@ -62,7 +62,7 @@ class ubuntu_ltp_cve(test.test):
32 os.chdir(self.srcdir)
33 shutil.rmtree('ltp', ignore_errors=True)
34 branch = 'sru'
35- cmd = 'git clone -b {} git://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
36+ cmd = 'git clone -b {} https://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
37 utils.system_output(cmd, retain_output=True)
38
39 # Print test suite HEAD SHA1 commit id for future reference
40diff --git a/ubuntu_ltp_kernel_misc/ubuntu_ltp_kernel_misc.py b/ubuntu_ltp_kernel_misc/ubuntu_ltp_kernel_misc.py
41index 01f5a7f..7c706a2 100644
42--- a/ubuntu_ltp_kernel_misc/ubuntu_ltp_kernel_misc.py
43+++ b/ubuntu_ltp_kernel_misc/ubuntu_ltp_kernel_misc.py
44@@ -79,7 +79,7 @@ class ubuntu_ltp_kernel_misc(test.test):
45 branch = 'sru-' + self.series
46 print("Use a fixed branch for ESM series - {}".format(branch))
47
48- cmd = 'git clone -b {} --depth 1 git://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
49+ cmd = 'git clone -b {} --depth 1 https://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
50 utils.system_output(cmd, retain_output=True)
51
52 # Print test suite HEAD SHA1 commit id for future reference
53diff --git a/ubuntu_ltp_stable/ubuntu_ltp_stable.py b/ubuntu_ltp_stable/ubuntu_ltp_stable.py
54index 7ca66ce..fdc5226 100644
55--- a/ubuntu_ltp_stable/ubuntu_ltp_stable.py
56+++ b/ubuntu_ltp_stable/ubuntu_ltp_stable.py
57@@ -65,7 +65,7 @@ class ubuntu_ltp_stable(test.test):
58 os.chdir(self.srcdir)
59 shutil.rmtree('ltp', ignore_errors=True)
60 branch = 'sru'
61- cmd = 'git clone -b {} git://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
62+ cmd = 'git clone -b {} https://git.launchpad.net/~canonical-kernel-team/+git/ltp'.format(branch)
63 utils.system_output(cmd, retain_output=True)
64
65 # Print test suite HEAD SHA1 commit id for future reference
66diff --git a/ubuntu_ramfs_stress/ubuntu_ramfs_stress.py b/ubuntu_ramfs_stress/ubuntu_ramfs_stress.py
67index 13fd385..062fb47 100644
68--- a/ubuntu_ramfs_stress/ubuntu_ramfs_stress.py
69+++ b/ubuntu_ramfs_stress/ubuntu_ramfs_stress.py
70@@ -49,7 +49,7 @@ class ubuntu_ramfs_stress(test.test):
71 utils.system('cp %s/ubuntu_ramfs_stress.sh %s' % (self.bindir, self.srcdir))
72 os.chdir(self.srcdir)
73 shutil.rmtree('stress-ng', ignore_errors=True)
74- cmd = 'git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
75+ cmd = 'git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng 2>&1'
76 self.results = utils.system_output(cmd, retain_output=True)
77
78 # Print test suite HEAD SHA1 commit id for future reference
79diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
80index 4ba80bb..fda911c 100644
81--- a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
82+++ b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test.py
83@@ -51,7 +51,7 @@ class ubuntu_stress_smoke_test(test.test):
84 self.job.require_gcc()
85 os.chdir(self.srcdir)
86 shutil.rmtree('stress-ng', ignore_errors=True)
87- cmd = 'git clone --depth=1 git://git.launchpad.net/~canonical-kernel-team/+git/stress-ng'
88+ cmd = 'git clone --depth=1 https://git.launchpad.net/~canonical-kernel-team/+git/stress-ng'
89 self.results = utils.system_output(cmd, retain_output=True)
90
91 # Print test suite HEAD SHA1 commit id for future reference

Subscribers

People subscribed via source and target branches

to all changes: