Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sp2 merge #140

Merged
merged 6 commits into from Oct 19, 2020
Merged

Sp2 merge #140

merged 6 commits into from Oct 19, 2020

Conversation

jreidinger
Copy link
Member

merge of #139

regarding moving firewall config to first stage, I would let it to own PBI.

Rakefile Outdated
@@ -1,5 +1,7 @@
require "yast/rake"

Yast::Tasks.submit_to :sle15sp2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be removed or revoked the same as the Dockerfile

@coveralls
Copy link

coveralls commented Oct 19, 2020

Coverage Status

Coverage increased (+0.007%) to 88.65% when pulling 039d9a4 on sp2_merge into 8fe8d17 on master.

@@ -81,6 +81,9 @@ def configure_firewall
# Convenience method to enable / disable the firewalld service depending
# on the proposal settings
def configure_firewall_service
# do not run in autoyast as it is done in second stage (bsc#1177778)
return if Yast::Mode.auto
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As commented in #139 it probably should not be done in master as it should be already handled.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return Y2Firewall::Clients::Auto.new.write

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After checked it is ok to be added.

Copy link
Contributor

@teclator teclator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jreidinger jreidinger merged commit b0758ce into master Oct 19, 2020
@jreidinger jreidinger deleted the sp2_merge branch October 19, 2020 08:30
@yast-bot
Copy link
Contributor

✔️ Internal Jenkins job #16 successfully finished
✔️ Created IBS submit request #228719

@yast-bot
Copy link
Contributor

✔️ Public Jenkins job #39 successfully finished
✔️ Created OBS submit request #842499

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants