Compare commits

...

2 Commits

Author SHA1 Message Date
40b3af462d
add checksum combo for images 2022-07-08 14:41:06 -07:00
5f2f3cae5b
properly loop live images 2022-07-08 14:33:14 -07:00
2 changed files with 26 additions and 13 deletions

View File

@ -1445,6 +1445,7 @@ class RepoSync:
"global", "global",
) )
# Standard ISOs
self.log.info(Color.INFO + 'Starting to sync ISOs to compose') self.log.info(Color.INFO + 'Starting to sync ISOs to compose')
if os.path.exists('/usr/bin/fpsync'): if os.path.exists('/usr/bin/fpsync'):
@ -1467,6 +1468,7 @@ class RepoSync:
else: else:
self.log.info(Color.INFO + message) self.log.info(Color.INFO + message)
# Live images
if os.path.exists(live_root): if os.path.exists(live_root):
self.log.info(Color.INFO + 'Starting to sync live images to compose') self.log.info(Color.INFO + 'Starting to sync live images to compose')
@ -1480,8 +1482,7 @@ class RepoSync:
else: else:
self.log.info(Color.INFO + message) self.log.info(Color.INFO + message)
# Sync the cloud images? # Cloud images
if os.path.exists(images_root): if os.path.exists(images_root):
self.log.info(Color.INFO + 'Starting to sync cloud images to compose') self.log.info(Color.INFO + 'Starting to sync cloud images to compose')
@ -1499,25 +1500,37 @@ class RepoSync:
for arch in self.arches: for arch in self.arches:
iso_arch_root = os.path.join(sync_iso_root, arch) iso_arch_root = os.path.join(sync_iso_root, arch)
iso_arch_checksum = os.path.join(iso_arch_root, 'CHECKSUM') iso_arch_checksum = os.path.join(iso_arch_root, 'CHECKSUM')
with open(iso_arch_checksum, 'w+', encoding='utf-8') as fp: if os.path.exists(iso_arch_root):
for check in glob.iglob(iso_arch_root + '/*.CHECKSUM'): with open(iso_arch_checksum, 'w+', encoding='utf-8') as fp:
with open(check, 'r', encoding='utf-8') as sum: for check in glob.iglob(iso_arch_root + '/*.CHECKSUM'):
for line in sum: with open(check, 'r', encoding='utf-8') as sum:
fp.write(line) for line in sum:
sum.close() fp.write(line)
fp.close() sum.close()
fp.close()
if arch == 'x86_64' and os.path.exists(sync_live_root): live_arch_root = os.path.join(sync_live_root, arch)
live_arch_root = os.path.join(sync_live_root, arch) live_arch_checksum = os.path.join(live_arch_root, 'CHECKSUM')
live_arch_checksum = os.path.join(live_arch_root, 'CHECKSUM') if os.path.exists(live_arch_root):
with open(live_arch_checksum, 'w+', encoding='utf-8') as lp: with open(live_arch_checksum, 'w+', encoding='utf-8') as lp:
for lcheck in glob.iglob(iso_arch_root + '/*.CHECKSUM'): for lcheck in glob.iglob(live_arch_root + '/*.CHECKSUM'):
with open(lcheck, 'r', encoding='utf-8') as sum: with open(lcheck, 'r', encoding='utf-8') as sum:
for line in sum: for line in sum:
lp.write(line) lp.write(line)
sum.close() sum.close()
lp.close() lp.close()
images_arch_root = os.path.join(sync_images_root, arch)
images_arch_checksum = os.path.join(sync_images_root, arch)
if os.path.exists(images_arch_root):
with open(images_arch_checksum, 'w+', encoding='utf-8') as ip:
for icheck in glob.iglob(images_arch_root + '/*.CHECKSUM'):
with open(icheck, 'r', encoding='utf-8') as sum:
for line in sum:
ip.write(line)
sum.close()
ip.close()
# Deploy final metadata for a close out # Deploy final metadata for a close out
self.deploy_metadata(sync_root) self.deploy_metadata(sync_root)