From 7710c441e709c26f8fad8a4a8cdeda51d196c80b Mon Sep 17 00:00:00 2001 From: Cockpituous Date: Mon, 23 Apr 2018 13:42:52 +0000 Subject: [PATCH 1/2] images: Update fedora-atomic image --- bots/images/fedora-atomic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bots/images/fedora-atomic b/bots/images/fedora-atomic index 5cf0557f180d..f2e22a835c72 120000 --- a/bots/images/fedora-atomic +++ b/bots/images/fedora-atomic @@ -1 +1 @@ -fedora-atomic-f3526b8f73fdb1f1e52fe77e152dfb0a77caa9abb5078d9f3e82268d226a2ca3.qcow2 \ No newline at end of file +fedora-atomic-08381a3559f5e17f01d0a40f8a826fdcec543910db4b48feb5409e16bfc2d58e.qcow2 \ No newline at end of file From fabf22f3d10448de25d0194a5e41eafd63be8dad Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 24 Apr 2018 14:21:38 +0200 Subject: [PATCH 2/2] bots: Ignore "ostree admin status" GPG validation error in atomic.install Recently the GPG validation error started to become fatal: https://bugzilla.redhat.com/show_bug.cgi?id=1571264 Work around this by ignoring the failure. Closes #9002 --- bots/images/scripts/lib/atomic.install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bots/images/scripts/lib/atomic.install b/bots/images/scripts/lib/atomic.install index e91f36d22a38..554fa81ae321 100755 --- a/bots/images/scripts/lib/atomic.install +++ b/bots/images/scripts/lib/atomic.install @@ -222,7 +222,8 @@ class AtomicCockpitInstaller: def run(self): # Delete previous deployment if it's present - output = subprocess.check_output(["ostree", "admin", "status"]) + # HACK: this command fails with a GPG validation error (https://bugzilla.redhat.com/show_bug.cgi?id=1571264) + output = subprocess.check_output(["ostree admin status || true"], shell=True) if output.count("origin refspec") != 1: subprocess.check_call(["ostree", "admin", "undeploy", "1"])