Skip to content

Commit

Permalink
bots: Use Fedora 29 to build packages for Fedora Atomic
Browse files Browse the repository at this point in the history
Our fedora-atomic image is Fedora 29 now.

Closes cockpit-project#10713
  • Loading branch information
martinpitt authored and KKoukiou committed Nov 30, 2018
1 parent 35348da commit 3cc4a57
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions bots/machine/machine_core/machine_virtual.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@

# The Atomic variants can't build their own packages, so we build in
# their non-Atomic siblings. For example, fedora-atomic is built
# in fedora-28
# in fedora-29
def get_build_image(image):
(test_os, unused) = os.path.splitext(os.path.basename(image))
if test_os == "fedora-atomic":
image = "fedora-28"
image = "fedora-29"
elif test_os == "rhel-atomic":
image = "rhel-7-6"
elif test_os == "continuous-atomic":
Expand Down
4 changes: 2 additions & 2 deletions test/common/testlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -877,12 +877,12 @@ def check_journal_messages(self, machine=None):
# HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1557913
# HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1563143
# these fail tons of tests due to the SELinux violations (so naughty override causes too much spamming)
if self.image in ['fedora-28', 'fedora-atomic']:
if self.image in ['fedora-28']:
self.allowed_messages.append('audit: type=1400 audit(.*): avc: denied { dac_override }.*')
self.allowed_messages.append('audit: type=1400 audit(.*): avc: denied { module_request }.*')
self.allowed_messages.append('audit: type=1400 audit(.*): avc: denied { getattr } for .* comm="which" path="/usr/sbin/setfiles".*')

if self.image in ['fedora-29', 'fedora-testing', 'fedora-i386']:
if self.image in ['fedora-29', 'fedora-testing', 'fedora-i386', 'fedora-atomic']:
# HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1563143
self.allowed_messages.append('audit: type=1400 audit(.*): avc: denied { getattr } for .* comm="which" path="/usr/sbin/setfiles".*')
# HACK: https://bugzilla.redhat.com/show_bug.cgi?id=1629588
Expand Down

0 comments on commit 3cc4a57

Please sign in to comment.