almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity
247a1a71ba
pungi/tests/test_ostree_script.py

374 lines
17 KiB
Python
Raw Normal View History

[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
#!/usr/bin/env python
# -*- coding: utf-8 -*-
import unittest
import mock
import os
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
import json
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
import sys
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
import datetime
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..'))
sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'bin'))
from tests import helpers
[ostree] Rename atomic to ostree Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-04-05 07:13:01 +00:00
from pungi import ostree
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
class OstreeTreeScriptTest(helpers.PungiTestCase):
def _make_dummy_config_dir(self, path):
helpers.touch(os.path.join(path, 'fedora-atomic-docker-host.json'),
json.dumps({'ref': 'fedora-atomic/25/x86_64',
'repos': ['fedora-rawhide', 'fedora-24', 'fedora-23']}))
helpers.touch(os.path.join(path, 'fedora-rawhide.repo'),
'[fedora-rawhide]\nmirrorlist=mirror-mirror-on-the-wall')
helpers.touch(os.path.join(path, 'fedora-24.repo'),
'[fedora-24]\nmetalink=who-is-the-fairest-of-them-all')
helpers.touch(os.path.join(path, 'fedora-23.repo'),
'[fedora-23]\nbaseurl=why-not-zoidberg?')
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
@mock.patch('kobo.shortcuts.run')
[ostree] Move cloning repo back to compose box and pass absolute path to the config into runroot. This could avoid the problem of not being able to clone the repo in runroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-04-07 12:33:37 +00:00
def test_full_run(self, run):
[ostree] Rename atomic to ostree Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-04-05 07:13:01 +00:00
repo = os.path.join(self.topdir, 'atomic')
ostree.main([
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
'tree',
'--repo=%s' % repo,
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s/fedora-atomic-docker-host.json' % self.topdir,
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
])
[ostree] Move cloning config repo to chroot Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-04-05 06:40:54 +00:00
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
self.maxDiff = None
self.assertItemsEqual(
run.call_args_list,
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
[mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'],
[ostree] Log to stdout as well Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-04-08 09:17:49 +00:00
logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True),
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo,
ostree: Use the write-commitid-to feature rather than parsing ostree logs This depends on an rpm-ostree release with https://github.com/projectatomic/rpm-ostree/commit/98332a3be436a9a8afac789ab5317f67d133b284 Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2016-10-17 20:22:06 +00:00
'--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'),
[ostree] Move cloning repo back to compose box and pass absolute path to the config into runroot. This could avoid the problem of not being able to clone the repo in runroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-04-07 12:33:37 +00:00
self.topdir + '/fedora-atomic-docker-host.json'],
[ostree] Log to stdout as well Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-04-08 09:17:49 +00:00
logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)])
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
[ostree] Initialize empty repo Make sure the directory exists before calling Koji (because otherwise the mounting will fail). Update the runroot script to initialize the repo when there are no files in the target destination. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-09 13:59:02 +00:00
@mock.patch('kobo.shortcuts.run')
def test_run_on_existing_empty_dir(self, run):
repo = os.path.join(self.topdir, 'atomic')
os.mkdir(repo)
ostree.main([
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
'tree',
'--repo=%s' % repo,
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s/fedora-atomic-docker-host.json' % self.topdir,
[ostree] Initialize empty repo Make sure the directory exists before calling Koji (because otherwise the mounting will fail). Update the runroot script to initialize the repo when there are no files in the target destination. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-09 13:59:02 +00:00
])
self.maxDiff = None
self.assertItemsEqual(
run.call_args_list,
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
[mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'],
[ostree] Initialize empty repo Make sure the directory exists before calling Koji (because otherwise the mounting will fail). Update the runroot script to initialize the repo when there are no files in the target destination. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-09 13:59:02 +00:00
logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True),
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo,
ostree: Use the write-commitid-to feature rather than parsing ostree logs This depends on an rpm-ostree release with https://github.com/projectatomic/rpm-ostree/commit/98332a3be436a9a8afac789ab5317f67d133b284 Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2016-10-17 20:22:06 +00:00
'--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'),
[ostree] Initialize empty repo Make sure the directory exists before calling Koji (because otherwise the mounting will fail). Update the runroot script to initialize the repo when there are no files in the target destination. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-09 13:59:02 +00:00
self.topdir + '/fedora-atomic-docker-host.json'],
logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)])
@mock.patch('kobo.shortcuts.run')
def test_run_on_initialized_repo(self, run):
repo = os.path.join(self.topdir, 'atomic')
helpers.touch(os.path.join(repo, 'initialized'))
ostree.main([
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
'tree',
'--repo=%s' % repo,
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s/fedora-atomic-docker-host.json' % self.topdir,
[ostree] Initialize empty repo Make sure the directory exists before calling Koji (because otherwise the mounting will fail). Update the runroot script to initialize the repo when there are no files in the target destination. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-09 13:59:02 +00:00
])
self.maxDiff = None
self.assertItemsEqual(
run.call_args_list,
Stop using str.format On Python 2.6, it requires the format placeholder to have explicit index of argument, so using % formatting is easier. There are a couple places where the method is still used because the same argument is used twice. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-25 11:37:39 +00:00
[mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo,
ostree: Use the write-commitid-to feature rather than parsing ostree logs This depends on an rpm-ostree release with https://github.com/projectatomic/rpm-ostree/commit/98332a3be436a9a8afac789ab5317f67d133b284 Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
2016-10-17 20:22:06 +00:00
'--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'),
[ostree] Initialize empty repo Make sure the directory exists before calling Koji (because otherwise the mounting will fail). Update the runroot script to initialize the repo when there are no files in the target destination. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-05-09 13:59:02 +00:00
self.topdir + '/fedora-atomic-docker-host.json'],
logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)])
[ostree] New option to enable generating ostree summary file Added new option '--update-summary' to pungi-make-ostree, and this can be enabled in ostree settings with 'update_summary'. A summary file will be generated (or re-generated if it was presented in an existing ostree repo) when it is enabled. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-11-03 12:59:00 +00:00
@mock.patch('kobo.shortcuts.run')
def test_update_summary(self, run):
repo = os.path.join(self.topdir, 'atomic')
ostree.main([
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
'tree',
'--repo=%s' % repo,
[ostree] New option to enable generating ostree summary file Added new option '--update-summary' to pungi-make-ostree, and this can be enabled in ostree settings with 'update_summary'. A summary file will be generated (or re-generated if it was presented in an existing ostree repo) when it is enabled. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-11-03 12:59:00 +00:00
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s/fedora-atomic-docker-host.json' % self.topdir,
'--update-summary',
])
self.maxDiff = None
self.assertItemsEqual(
run.call_args_list,
[mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'],
logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True),
mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo,
'--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'),
self.topdir + '/fedora-atomic-docker-host.json'],
logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True),
mock.call(['ostree', 'summary', '-u', '--repo=%s' % repo],
logfile=self.topdir + '/logs/Atomic/ostree-summary.log', show_cmd=True, stdout=True)]),
[ostree] Allow adding versioning metadata Added new option '--version' to pungi-make-ostree, and this can be enabled in ostree settings with 'version'. The version string will be added as versioning metadata if this is specified. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-11-04 08:07:26 +00:00
@mock.patch('kobo.shortcuts.run')
def test_versioning_metadata(self, run):
repo = os.path.join(self.topdir, 'atomic')
ostree.main([
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
'tree',
'--repo=%s' % repo,
[ostree] Allow adding versioning metadata Added new option '--version' to pungi-make-ostree, and this can be enabled in ostree settings with 'version'. The version string will be added as versioning metadata if this is specified. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-11-04 08:07:26 +00:00
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s/fedora-atomic-docker-host.json' % self.topdir,
'--version=24',
])
self.maxDiff = None
self.assertItemsEqual(
run.call_args_list,
[mock.call(['ostree', 'init', '--repo=%s' % repo, '--mode=archive-z2'],
logfile=self.topdir + '/logs/Atomic/init-ostree-repo.log', show_cmd=True, stdout=True),
mock.call(['rpm-ostree', 'compose', 'tree', '--repo=%s' % repo,
'--write-commitid-to=%s' % (self.topdir + '/logs/Atomic/commitid.log'),
'--add-metadata-string=version=24',
self.topdir + '/fedora-atomic-docker-host.json'],
logfile=self.topdir + '/logs/Atomic/create-ostree-repo.log', show_cmd=True, stdout=True)])
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
@mock.patch('pungi.ostree.utils.datetime')
@mock.patch('kobo.shortcuts.run')
def test_extra_config_with_extra_repos(self, run, time):
time.datetime.now.return_value = datetime.datetime(2016, 1, 1, 1, 1)
timestamp = time.datetime.now().strftime("%Y%m%d%H%M%S")
configdir = os.path.join(self.topdir, 'config')
self._make_dummy_config_dir(configdir)
treefile = os.path.join(configdir, 'fedora-atomic-docker-host.json')
repo = os.path.join(self.topdir, 'atomic')
extra_config_file = os.path.join(self.topdir, 'extra_config.json')
extra_config = {
consolidate repo option names live_images: additional_repos -> repo ostree: source_repo_from -> repo_from extra_source_repos -> repo ostree_installer: source_repo_from -> repo_from With the change, the phases have consolidate option names for variant repos and external repos. Old option names will continue to work, old names will be converted to new names after validation automatically if new options are not specified in config. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-02-22 02:48:05 +00:00
"repo": [
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
{
"name": "server",
"baseurl": "http://www.example.com/Server/repo",
},
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
{
"name": "optional",
"baseurl": "http://example.com/repo/x86_64/optional",
"exclude": "systemd-container",
"gpgcheck": False
},
{
"name": "extra",
"baseurl": "http://example.com/repo/x86_64/extra",
}
]
}
helpers.touch(extra_config_file, json.dumps(extra_config))
ostree.main([
'tree',
'--repo=%s' % repo,
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s' % treefile,
'--extra-config=%s' % extra_config_file,
])
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
server_repo_name = "server-%s" % timestamp
server_repo = os.path.join(configdir, "%s.repo" % server_repo_name)
self.assertTrue(os.path.isfile(server_repo))
with open(server_repo, 'r') as f:
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
content = f.read()
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
self.assertIn("[%s]" % server_repo_name, content)
self.assertIn("name=%s" % server_repo_name, content)
self.assertIn("baseurl=http://www.example.com/Server/repo", content)
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
self.assertIn("gpgcheck=0", content)
optional_repo_name = "optional-%s" % timestamp
optional_repo = os.path.join(configdir, "%s.repo" % optional_repo_name)
self.assertTrue(os.path.isfile(optional_repo))
with open(optional_repo, 'r') as f:
content = f.read()
self.assertIn("[%s]" % optional_repo_name, content)
self.assertIn("name=%s" % optional_repo_name, content)
self.assertIn("baseurl=http://example.com/repo/x86_64/optional", content)
self.assertIn("gpgcheck=0", content)
extra_repo_name = "extra-%s" % timestamp
extra_repo = os.path.join(configdir, "%s.repo" % extra_repo_name)
self.assertTrue(os.path.isfile(extra_repo))
with open(extra_repo, 'r') as f:
content = f.read()
self.assertIn("[%s]" % extra_repo_name, content)
self.assertIn("name=%s" % extra_repo_name, content)
self.assertIn("baseurl=http://example.com/repo/x86_64/extra", content)
self.assertIn("gpgcheck=0", content)
treeconf = json.load(open(treefile, 'r'))
repos = treeconf['repos']
self.assertEqual(len(repos), 3)
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
for name in [server_repo_name, optional_repo_name, extra_repo_name]:
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
self.assertIn(name, repos)
@mock.patch('pungi.ostree.utils.datetime')
@mock.patch('kobo.shortcuts.run')
def test_extra_config_with_keep_original_sources(self, run, time):
time.datetime.now.return_value = datetime.datetime(2016, 1, 1, 1, 1)
timestamp = time.datetime.now().strftime("%Y%m%d%H%M%S")
configdir = os.path.join(self.topdir, 'config')
self._make_dummy_config_dir(configdir)
treefile = os.path.join(configdir, 'fedora-atomic-docker-host.json')
repo = os.path.join(self.topdir, 'atomic')
extra_config_file = os.path.join(self.topdir, 'extra_config.json')
extra_config = {
consolidate repo option names live_images: additional_repos -> repo ostree: source_repo_from -> repo_from extra_source_repos -> repo ostree_installer: source_repo_from -> repo_from With the change, the phases have consolidate option names for variant repos and external repos. Old option names will continue to work, old names will be converted to new names after validation automatically if new options are not specified in config. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-02-22 02:48:05 +00:00
"repo": [
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
{
"name": "server",
"baseurl": "http://www.example.com/Server/repo",
},
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
{
"name": "optional",
"baseurl": "http://example.com/repo/x86_64/optional",
"exclude": "systemd-container",
"gpgcheck": False
},
{
"name": "extra",
"baseurl": "http://example.com/repo/x86_64/extra",
}
],
"keep_original_sources": True
}
helpers.touch(extra_config_file, json.dumps(extra_config))
ostree.main([
'tree',
'--repo=%s' % repo,
'--log-dir=%s' % os.path.join(self.topdir, 'logs', 'Atomic'),
'--treefile=%s' % treefile,
'--extra-config=%s' % extra_config_file,
])
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
server_repo_name = "server-%s" % timestamp
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
optional_repo_name = "optional-%s" % timestamp
extra_repo_name = "extra-%s" % timestamp
treeconf = json.load(open(treefile, 'r'))
repos = treeconf['repos']
self.assertEqual(len(repos), 6)
for name in ['fedora-rawhide', 'fedora-24', 'fedora-23',
unify repo and repo_from options Config option 'repo' and 'repo_from' are used in several phases, merge them with one option 'repo'. 'append' in schema is used for appending the values from deprecated options to 'repo', so it won't break on any existing config files that have the old options of 'repo_from' and 'source_repo_from' (which is an alias of 'repo_from'). And 'repo' schema is updated to support repo dict as the value or an item in the values, a repo dict is just a dict contains repo options, 'baseurl' is required in the dict, like: {"baseurl": "http://example.com/url/to/repo"} or: {"baseurl": "Serer"} currently this is used in ostree phase to support extra repo options like: {"baseurl": "Server", "exclude": "systemd-container"} Signed-off-by: Qixiang Wan <qwan@redhat.com>
2017-03-27 21:53:08 +00:00
server_repo_name, optional_repo_name, extra_repo_name]:
[ostree] Add 'tree' sub-command to pungi-make-ostree script Update pungi-make-ostree to supourt sub-command 'tree', which is just as the original feature of pungi-make-ostree to compose OSTree tree. With the change we can add other sub commands later to build other OSTree artifacts, like the installer image. Inaddtional to the change, now the the 'tree' command can accept an optional '--extra-config' parameter to update the original tree configuration with extra configurations specified in a json file before composing the OSTree tree. Example: pungi-make-ostree tree --repo=/ostree --treefile=/path/to/treefile \ --log-dir=/path/to/log --extra-config=/path/to/extra-config.json The extra-config file can contains the same configuration as OSTree phase, the difference is it doesn't understand variant UID as source repo since it's not ran in the chain of phases. A valid configuration can be like: { "source_repo_from": "http://example.com/repo/x86_64/Server", "extra_source_repos": [ { "name": "optional", "baseurl": "http://example.com/repo/x86_64/optional", "exclude": "systemd-container", "gpgcheck": False }, { "name": "extra", "baseurl": "http://example.com/repo/x86_64/extra", } ], "keep_original_sources": True } The OSTree phase is updated to move out the task of updating treefile, instead of that, it writes the extra configurations to a json file, then 'pungi-make-ostree tree' will take it by option '--extra-config'. Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-02 12:11:09 +00:00
self.assertIn(name, repos)
[ostree-installer] Add 'installer' sub-command to pungi-make-ostree The new sub-command 'installer' is added to support build OSTree installer image with pungi-make-ostree. It can take an optional argument '--extra-config' to read some of configurations from a json file. The content of the json file can contains the configuration which are supported in OSTree installer phase, the difference is variant UID is not supported as a repo url in this case. A valid json file can be like the following: { "source_repo_from": "http://www.example.com/repo/workstation/os", "installpkgs": [ "fedora-productimg-workstation" ], "add_template": [ "/path/to/installer/template/lorax-configure-repo.tmpl" ], "add_template_var": [ "ostree_osname=fedora-workstation", "ostree_ref=fedora/25/x86_64/workstation" ], "add_arch_template": [ "/path/to/installer/template/lorax-embed-repo.tmpl" ], "add_arch_template_var": [ "ostree_repo=https://www.example.com/compose/ostree", "ostree_osname=fedora-workstation", "ostree_ref=fedora/25/x86_64/workstation" ] } Signed-off-by: Qixiang Wan <qwan@redhat.com>
2016-12-04 18:02:51 +00:00
class OstreeInstallerScriptTest(helpers.PungiTestCase):
def setUp(self):
super(OstreeInstallerScriptTest, self).setUp()
self.product = "dummyproduct"
self.version = "1.0"
self.release = "20160101.t.0"
self.output = os.path.join(self.topdir, 'output')
self.logdir = os.path.join(self.topdir, 'logs')
self.volid = '%s-%s' % (self.product, self.version)
self.variant = 'dummy'
self.rootfs_size = None
@mock.patch('kobo.shortcuts.run')
def test_run_with_args(self, run):
args = ['installer',
'--product=%s' % self.product,
'--version=%s' % self.version,
'--release=%s' % self.release,
'--output=%s' % self.output,
'--variant=%s' % self.variant,
'--rootfs-size=%s' % self.rootfs_size,
'--nomacboot',
'--isfinal']
args.append('--source=%s' % 'http://www.example.com/dummy/repo')
args.append('--installpkgs=dummy-foo')
args.append('--installpkgs=dummy-bar')
args.append('--add-template=/path/to/lorax.tmpl')
args.append('--add-template-var=ostree_osname=dummy')
args.append('--add-arch-template=/path/to/lorax-embed.tmpl')
args.append('--add-arch-template-var=ostree_repo=http://www.example.com/ostree')
ostree.main(args)
self.maxDiff = None
self.assertItemsEqual(run.mock_calls,
[mock.call(['lorax',
'--product=dummyproduct',
'--version=1.0',
'--release=20160101.t.0',
'--source=http://www.example.com/dummy/repo',
'--variant=dummy',
'--nomacboot',
'--isfinal',
'--installpkgs=dummy-foo',
'--installpkgs=dummy-bar',
'--add-template=/path/to/lorax.tmpl',
'--add-arch-template=/path/to/lorax-embed.tmpl',
'--add-template-var=ostree_osname=dummy',
'--add-arch-template-var=ostree_repo=http://www.example.com/ostree',
'--rootfs-size=None',
self.output])])
@mock.patch('kobo.shortcuts.run')
def test_run_with_extra_config_file(self, run):
extra_config_file = os.path.join(self.topdir, 'extra_config.json')
helpers.touch(extra_config_file,
json.dumps({'source_repo_from': 'http://www.example.com/another/repo',
'installpkgs': ['dummy-foo', 'dummy-bar'],
'add_template': ['/path/to/lorax.tmpl'],
'add_template_var': ['ostree_osname=dummy-atomic',
'ostree_ref=dummy/x86_64/docker'],
'add_arch_template': ['/path/to/lorax-embed.tmpl'],
'add_arch_template_var': ['ostree_osname=dummy-atomic',
'ostree_repo=http://www.example.com/ostree']}))
args = ['installer',
'--product=%s' % self.product,
'--version=%s' % self.version,
'--release=%s' % self.release,
'--output=%s' % self.output,
'--variant=%s' % self.variant,
'--rootfs-size=%s' % self.rootfs_size,
'--nomacboot',
'--isfinal']
args.append('--source=%s' % 'http://www.example.com/dummy/repo')
args.append('--extra-config=%s' % extra_config_file)
ostree.main(args)
self.maxDiff = None
self.assertItemsEqual(run.mock_calls,
[mock.call(['lorax',
'--product=dummyproduct',
'--version=1.0',
'--release=20160101.t.0',
'--source=http://www.example.com/dummy/repo',
'--source=http://www.example.com/another/repo',
'--variant=dummy',
'--nomacboot',
'--isfinal',
'--installpkgs=dummy-foo',
'--installpkgs=dummy-bar',
'--add-template=/path/to/lorax.tmpl',
'--add-arch-template=/path/to/lorax-embed.tmpl',
'--add-template-var=ostree_osname=dummy-atomic',
'--add-template-var=ostree_ref=dummy/x86_64/docker',
'--add-arch-template-var=ostree_osname=dummy-atomic',
'--add-arch-template-var=ostree_repo=http://www.example.com/ostree',
'--rootfs-size=None',
self.output])])
[atomic] Add a script to create ostree repo This is a wrapper over ostree and rpm-ostree. It is intended to be run in either Koji or Mock chroot. Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2016-03-21 09:58:36 +00:00
if __name__ == '__main__':
unittest.main()
Reference in New Issue Copy Permalink