From 1c5e08082a6bbc4539bb8dfc60570d146bff5f5e Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Oct 31 2017 13:50:39 +0000 Subject: Remove locking based on bodhi runs We think this is no longer needed because we are no longer rsyncing ostree content in the sync script. We are using ostree pull-local which should mean that we don't have to worry about racing rsyncs. Signed-off-by: Dusty Mabe --- diff --git a/scripts/push-two-week-atomic.py b/scripts/push-two-week-atomic.py index 083a85d..f06ca6b 100755 --- a/scripts/push-two-week-atomic.py +++ b/scripts/push-two-week-atomic.py @@ -49,7 +49,6 @@ ATOMIC_HOST_DIR = "/mnt/koji/compose/updates/atomic" PREVIOUS_MAJOR_RELEASE_FINAL_COMMIT = None TARGET_REF = "fedora/%s/x86_64/atomic-host" COMPOSE_BASEDIR = "/mnt/koji/compose/twoweek/" -MASHER_LOCKFILE_GLOB = "/mnt/koji/mash/updates/MASHING*" # FIXME ???? Do we need a real STMP server here? ATOMIC_HOST_EMAIL_SMTP = "localhost" @@ -627,13 +626,6 @@ if __name__ == '__main__': "--release", help="Fedora Release to target for release (Ex: 24, 25, rawhide)", ) - parser.add_argument( - "-f", - "--force", - type=bool, - default=False, - help="Force the release even if masher lock files are found (check with RelEng first)", - ) pargs = parser.parse_args() if not pargs.key: @@ -643,20 +635,6 @@ if __name__ == '__main__': log.error("No release arg passed, see -h for help") sys.exit(1) - log.info("Checking for masher lock files") - if glob.glob(MASHER_LOCKFILE_GLOB) and not pargs.force: - errmsg = """ - Masher file found, must --force to proceed. - - MAKE SURE YOU KNOW WHAT YOU ARE DOING, WHEN IN DOUBT CHECK WITH - #fedora-releng on irc.freenode.net TO VERIFY WE ARE SAFE TO NOT - BREAK MASHER - """ - log.error(errmsg) - sys.exit(5) - - - log.info("Checking to make sure release is not currently blocked") if BLOCK_ATOMIC_HOST_RELEASE: log.info("Release Blocked: Exiting.")