Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

apply changed composer.py file for hotfix

Browse source
This commit is contained in:
Kevin Fenzi 2016-09-09 19:16:37 +00:00
parent 1235258471
commit ebe0be8347
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
roles/atomic-composer/files/composer.py
View file

@ -32,7 +32,9 @@ class AtomicComposer(object):
def compose(self, release): def compose(self, release):
release = copy.deepcopy(release) release = copy.deepcopy(release)
release['tmp_dir'] = tempfile.mkdtemp() # We need to use /var/tmp because systemd-nspawn will mount
# a tmpfs on /tmp in the container.
release['tmp_dir'] = tempfile.mkdtemp(dir='/var/tmp')
release['timestamp'] = time.strftime('%y%m%d.%H%M') release['timestamp'] = time.strftime('%y%m%d.%H%M')
try: try:
self.setup_logger(release) self.setup_logger(release)
@ -100,9 +102,13 @@ class AtomicComposer(object):
self.log.info('Deleting %s' % repo_file) self.log.info('Deleting %s' % repo_file)
os.unlink(repo_file) os.unlink(repo_file)
def mock_cmd(self, release, *cmd): def mock_cmd(self, release, *cmd, **kwargs):
"""Run a mock command in the chroot for a given release""" """Run a mock command in the chroot for a given release"""
self.call('{mock_cmd} --configdir={mock_dir}'.format(**release).split() fmt = '{mock_cmd}'
if kwargs.get('new_chroot') is True:
fmt +=' --new-chroot'
fmt += ' --configdir={mock_dir}'
self.call(fmt.format(**release).split()
+ list(cmd)) + list(cmd))
def init_mock(self, release): def init_mock(self, release):
@ -133,9 +139,9 @@ class AtomicComposer(object):
self.log.debug('Writing %s:\n%s', mock_cfg, mock_out) self.log.debug('Writing %s:\n%s', mock_cfg, mock_out)
cfg.write(mock_out) cfg.write(mock_out)
def mock_chroot(self, release, cmd): def mock_chroot(self, release, cmd, **kwargs):
"""Run a commend in the mock container for a release""" """Run a commend in the mock container for a release"""
self.mock_cmd(release, '--chroot', cmd) self.mock_cmd(release, '--chroot', cmd, **kwargs)
def generate_repo_files(self, release): def generate_repo_files(self, release):
"""Dynamically generate our yum repo configuration""" """Dynamically generate our yum repo configuration"""
@ -164,7 +170,8 @@ class AtomicComposer(object):
cmd = release['ostree_compose'] % treefile cmd = release['ostree_compose'] % treefile
with file(treefile, 'w') as tree: with file(treefile, 'w') as tree:
json.dump(release['treefile'], tree) json.dump(release['treefile'], tree)
self.mock_chroot(release, cmd) # Only use new_chroot for the invocation, as --clean and --new-chroot are buggy together right now
self.mock_chroot(release, cmd, new_chroot=True)
self.log.info('rpm-ostree compose complete (%s)', self.log.info('rpm-ostree compose complete (%s)',
datetime.utcnow() - start) datetime.utcnow() - start)