diff options
| author |   Jerome Brunet <jbrunet@baylibre.com> | 2017-09-07 10:41:02 +0200 |
|---|---|---|
| committer |   Kevin Hilman <khilman@baylibre.com> | 2017-09-07 12:06:11 -0700 |
| commit | b516553ebf08c2aec03b840d618fafd548656706 (patch) | |
| tree | 7e807339356d97773b70521c370173295fb47a38 /utils | |
| parent | 05146fa425d94a77ba35b43ac3b0a5c633163d4e (diff) | |
rootfs_type: add default rootfs type for each device
Add a default rootfs type for each device. the type can still be
overridden from the command line. The 'boot' parameter is no longer
required with this change
Change-Id: I666287d83652bcd81d9619eee75bf9be292d936a
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/agljobtemplate.py | 6 | ||||
| -rwxr-xr-x | utils/create-jobs.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index 749d4bf..2b80127 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -45,7 +45,7 @@ class Agljobtemplate(object): def rfs_types(self): return self.RFS_TYPE - def render_job(self, url, machine, job_name="AGL-short-smoke", priority="medium", tests=[], rfs_type="nbd"): + def render_job(self, url, machine, job_name="AGL-short-smoke", priority="medium", tests=[], rfs_type=None): test_templates = [] if machine not in self.machines: @@ -64,7 +64,9 @@ class Agljobtemplate(object): job['priority'] = priority job['urlbase'] = url job['test_templates'] = test_templates - job['rootfs_type'] = rfs_type + + if rfs_type is not None: + job['rootfs_type'] = rfs_type env = jinja2.Environment(loader=jinja2.FileSystemLoader(self._template_path)) env.filters['get_extension'] = get_extension diff --git a/utils/create-jobs.py b/utils/create-jobs.py index 1c15bb6..2bc293d 100755 --- a/utils/create-jobs.py +++ b/utils/create-jobs.py @@ -18,7 +18,7 @@ def parse_cmdline(machines, tests, rfs_types): parser.add_argument('--urlbase', '-u', action='store', dest='urlbase', help="url fetch base", default='https://download.automotivelinux.org/AGL/upload/ci/') - parser.add_argument('--boot', action='store', dest='rfs_type', nargs=1, required=True, + parser.add_argument('--boot', action='store', dest='rfs_type', choices=rfs_types, help='select boot type') parser.add_argument('--test', dest='tests', action='store', choices=tests + ['all'], help="add these test to the job", nargs='*', default=[]) @@ -50,7 +50,7 @@ def main(): args.job_name += ' - {}'.format(args.job_index) job = ajt.render_job(args.urlbase, args.machine, tests=args.tests, priority=args.priority, - rfs_type=args.rfs_type[0], job_name=args.job_name) + rfs_type=args.rfs_type, job_name=args.job_name) if args.job_file is None: print job |