alt/cloud-build
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor building and signing to be manually run

Browse Source
This commit is contained in:
Mikhail Gordeev 2019-09-07 00:34:55 +03:00
parent d9f3c00355
commit 0a1dd9ecec
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cloud-build.py
View File

@ -34,6 +34,8 @@ class CB:
self.ensure_run_once() self.ensure_run_once()
self.checksum_command = 'sha256sum'
self.images_dir = data_dir / 'images' self.images_dir = data_dir / 'images'
self.work_dir = data_dir / 'work' self.work_dir = data_dir / 'work'
self.out_dir = data_dir / 'out' self.out_dir = data_dir / 'out'
@ -471,7 +473,6 @@ Dir::Etc::preferencesparts "/var/empty";
def create_images(self) -> None: def create_images(self) -> None:
self.clear_imager_dir() self.clear_imager_dir()
for branch in self.branches: for branch in self.branches:
images_in_branch = []
for image in self.images: for image in self.images:
self.ensure_scripts(image) self.ensure_scripts(image)
target = self.target_by_image(image) target = self.target_by_image(image)
@ -494,26 +495,24 @@ Dir::Etc::preferencesparts "/var/empty";
**test, **test,
): ):
self.error(f'Test for {image} failed') self.error(f'Test for {image} failed')
images_in_branch.append(image_path)
self.checksum_sign(images_in_branch)
self.remove_old_tarballs() self.remove_old_tarballs()
def checksum_sign(self, images): def sign(self):
if len(images) == 0: sum_file = self.checksum_command.upper()
self.error('Empty list of images to checksum_sign') for branch in self.branches():
with self.pushd(self.images_dir / branch):
files = [f
for f in os.listdir()
if not f.startswith(sum_file)]
string = ','.join(files)
sum_file = 'SHA256SUM' cmd = [self.checksum_command] + files
with self.pushd(os.path.dirname(images[0])): self.info(f'Calculate checksum of {string}')
files = [os.path.basename(x) for x in images] self.call(cmd, stdout_to_file=sum_file)
string = ','.join(files)
cmd = ['sha256sum'] + files self.info(f'Sign checksum of {string}')
self.info(f'Calculate checksum of {string}') self.call(['gpg2', '--yes', '-basu', self.key, sum_file])
self.call(cmd, stdout_to_file=sum_file)
self.info(f'Sign checksum of {string}')
self.call(['gpg2', '--yes', '-basu', self.key, sum_file])
def kick(self): def kick(self):
remote = self._remote remote = self._remote
@ -523,12 +522,14 @@ Dir::Etc::preferencesparts "/var/empty";
self.call(['ssh', host, 'kick']) self.call(['ssh', host, 'kick'])
def sync(self) -> None: def sync(self) -> None:
self.create_images()
for branch in self.branches: for branch in self.branches:
remote = self.remote(branch) remote = self.remote(branch)
files = glob.glob(f'{self.images_dir}/{branch}/*') files = glob.glob(f'{self.images_dir}/{branch}/*')
cmd = ['rsync', '-v'] + files + [remote] if f'self.checksum_command.upper().asc' not in files:
self.call(cmd) self.error(f'No checksum signature in branch {branch}')
else:
cmd = ['rsync', '-v'] + files + [remote]
self.call(cmd)
self.kick() self.kick()
@ -567,6 +568,8 @@ def parse_args():
def main(): def main():
args = parse_args() args = parse_args()
cloud_build = CB(args.config, args.data_dir) cloud_build = CB(args.config, args.data_dir)
cloud_build.create_images()
cloud_build.sign()
cloud_build.sync() cloud_build.sync()