Also remove https repos in zypper_clear_repos #10661

DrMullings · 2020-07-08T13:09:46Z

This time with a regex in the original find expression

Related ticket: https://progress.opensuse.org/issues/66259

Followup to #10578
Verification needed

Vogtinator

Was too quick - wrong type of grouping. This would also match hththptphhths://foo.

Vogtinator · 2020-07-08T13:12:04Z

tests/update/zypper_clear_repos.pm

@@ -26,7 +26,7 @@ sub run {
    my $repos_folder = '/etc/zypp/repos.d';
    zypper_call 'lr -d', exitcode => [0, 6];
    assert_script_run(
-"find $repos_folder/*.repo -type f -exec grep -q 'baseurl=http://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",
+"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl='[http|https]://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",


Suggested change

"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl='[http|https]://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",

"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl='(http|https)://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",

Vogtinator · 2020-07-08T13:13:34Z

Thanks for merging, but maybe we should've verified it first?

It's not merged yet - without a verification run and success from travis that wouldn't be a good idea. The approval rating is only for code review AFAIK.

DrMullings · 2020-07-08T13:15:17Z

Confused the merged badge from the old one, sorry that

Vogtinator · 2020-07-08T13:17:03Z

tests/update/zypper_clear_repos.pm

@@ -26,7 +26,7 @@ sub run {
    my $repos_folder = '/etc/zypp/repos.d';
    zypper_call 'lr -d', exitcode => [0, 6];
    assert_script_run(
-"find $repos_folder/*.repo -type f -exec grep -q 'baseurl=http://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",
+"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl='(http|https)://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",


Suggested change

"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl='(http|https)://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",

"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl=(http|https)://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",

+1 was just gonna comment the same

This time with a regex in the original find expression

DrMullings · 2020-07-08T13:23:45Z

https://openqa.opensuse.org/tests/1327407

https://openqa.opensuse.org/tests/1327408

Removed the Quote and started one NET and one DVD verification

Vogtinator

Still works locally, though now without hypothetical false positives.

Maybe matching 'baseurl=[^:]+://download.opensuse.org/' is a better option, though currently we mostly use HTTP(s) everywhere.

DrMullings · 2020-07-08T13:30:13Z

Still works locally, though now without hypothetical false positives.

Maybe matching 'baseurl=[^:]+://download.opensuse.org/' is a better option, though currently we mostly use HTTP(s)

Wouldn't this match everything before ':' ? I would prefer keeping it as an OR, but I am no regex expert

My openqa-clone-custom-git-refspec seems still broken though, so if someone could run

openqa-clone-custom-git-refspec https://github.com/os-autoinst/os-autoinst-distri-opensuse/pull/10661 https://openqa.opensuse.org/tests/1327002 TEST=jrauch_test GROUP=0 _SKIP_POST_FAIL_HOOKS=1
openqa-clone-custom-git-refspec https://github.com/os-autoinst/os-autoinst-distri-opensuse/pull/10661 https://openqa.opensuse.org/tests/1325341 TEST=jrauch_test GROUP=0 _SKIP_POST_FAIL_HOOKS=1

we can verify it on O3

Vogtinator · 2020-07-08T13:32:51Z

Done:

https://openqa.opensuse.org/t1327410
https://openqa.opensuse.org/t1327411

Vogtinator · 2020-07-08T13:33:36Z

Still works locally, though now without hypothetical false positives.
Maybe matching 'baseurl=[^:]+://download.opensuse.org/' is a better option, though currently we mostly use HTTP(s)

Wouldn't this match everything before ':' ? I would prefer keeping it as an OR, but I am no regex expert

Yes, so also rsync://, ftps://, htTpS:// or just baseurl="http://.

DrMullings · 2020-07-09T06:34:46Z

Both verification are fine, travis has no complaints, can we merge this or do you insist on matching different protocols other than http(s)?

Vogtinator · 2020-07-09T06:39:33Z

Both verification are fine, travis has no complaints, can we merge this or do you insist on matching different protocols other than http(s)?

I'm fine with either.

DrMullings · 2020-07-09T07:34:11Z

Then merge it please

This time with a regex in the original find expression

DrMullings mentioned this pull request Jul 8, 2020

Also remove https repositories #10578

Merged

Vogtinator approved these changes Jul 8, 2020

View reviewed changes

Vogtinator requested changes Jul 8, 2020

View reviewed changes

DrMullings force-pushed the zypper_clear_repos branch from dbba337 to 36785b7 Compare July 8, 2020 13:15

Vogtinator requested changes Jul 8, 2020

View reviewed changes

Also remove https repos in zypper_clear_repos

b5ba450

This time with a regex in the original find expression

DrMullings force-pushed the zypper_clear_repos branch from 36785b7 to b5ba450 Compare July 8, 2020 13:22

Vogtinator approved these changes Jul 8, 2020

View reviewed changes

Vogtinator merged commit 0c5d8fa into os-autoinst:master Jul 9, 2020

XGWang0 pushed a commit to XGWang0/os-autoinst-distri-opensuse that referenced this pull request Jul 9, 2020

Also remove https repos in zypper_clear_repos (os-autoinst#10661)

a3506e1

This time with a regex in the original find expression

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Also remove https repos in zypper_clear_repos #10661

Also remove https repos in zypper_clear_repos #10661

DrMullings commented Jul 8, 2020

Vogtinator left a comment

Vogtinator Jul 8, 2020

DrMullings Jul 8, 2020

Vogtinator commented Jul 8, 2020

DrMullings commented Jul 8, 2020

Vogtinator Jul 8, 2020

foursixnine Jul 8, 2020

DrMullings commented Jul 8, 2020

Vogtinator left a comment

DrMullings commented Jul 8, 2020

Vogtinator commented Jul 8, 2020

Vogtinator commented Jul 8, 2020

DrMullings commented Jul 9, 2020

Vogtinator commented Jul 9, 2020

DrMullings commented Jul 9, 2020

	"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl='[http\|https]://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",
	"find $repos_folder/*.repo -type f -exec grep -Eq 'baseurl='(http\|https)://download.opensuse.org/' {} \\; -delete && echo 'unneed_repos_removed' > /dev/$serialdev",

Also remove https repos in zypper_clear_repos #10661

Also remove https repos in zypper_clear_repos #10661

Conversation

DrMullings commented Jul 8, 2020

Vogtinator left a comment

Choose a reason for hiding this comment

Vogtinator Jul 8, 2020

Choose a reason for hiding this comment

DrMullings Jul 8, 2020

Choose a reason for hiding this comment

Vogtinator commented Jul 8, 2020

DrMullings commented Jul 8, 2020

Vogtinator Jul 8, 2020

Choose a reason for hiding this comment

foursixnine Jul 8, 2020

Choose a reason for hiding this comment

DrMullings commented Jul 8, 2020

Vogtinator left a comment

Choose a reason for hiding this comment

DrMullings commented Jul 8, 2020

Vogtinator commented Jul 8, 2020

Vogtinator commented Jul 8, 2020

DrMullings commented Jul 9, 2020

Vogtinator commented Jul 9, 2020

DrMullings commented Jul 9, 2020