From ebb7150d36254dd8624dbc03e99a67fbaca7eb37 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Nov 14 2017 07:21:50 +0000 Subject: atomic: add --ostree-pungi-compose-id option This is so we can specify what pungi compose the ostrees were created in (if it differs from the pungi compose the media was created in). This is an optional argument. Signed-off-by: Dusty Mabe --- diff --git a/scripts/push-two-week-atomic.py b/scripts/push-two-week-atomic.py index 540d1f2..324c793 100755 --- a/scripts/push-two-week-atomic.py +++ b/scripts/push-two-week-atomic.py @@ -625,8 +625,21 @@ if __name__ == '__main__': required=True, help="The pungi compose that created the media (Ex: Fedora-27-20171110.n.1)." ) + parser.add_argument( + "--ostree-pungi-compose-id", + dest='ostree_pungi_compose_id', + help=""" + The pungi compose that created the ostree (Ex: Fedora-27-20171110.n.1). + This is optional and is only required if the pungi compose that ostree + commit is different than the ostree compose that created the media. + """ + ) pargs = parser.parse_args() + # This one is only specified if it differs from --pungi-compose-id + # If missing just assign it the value of pungi-compose-id. + if not pargs.ostree_pungi_compose_id: + pargs.ostree_pungi_compose_id = pargs.pungi_compose_id log.info("Checking to make sure release is not currently blocked") if BLOCK_ATOMIC_HOST_RELEASE: