af9e03ec08
Rewrite YAML parser, YAML objects and parameters expansion logic to
enable better control over expansion logic.
Broken backward compatilibity:
* More agressive parameter expansion. This may lead to parameters
expanded in places where they were not expanded before.
* Top-level elements, which is not known to parser (such as 'job',
'view', 'project' etc), are now lead to parse failures.
Prepend them with underscore to be ignored by parser.
* Files included using '!include-raw:' elements and having formatting in
it's path ('lazy-loaded' in previous implementation) are now expanded
too.
Use '!include-raw-escape:' for them instead.
See changes in these tests for examples:
tests/yamlparser/job_fixtures/lazy-load-jobs-multi001.yaml
tests/yamlparser/job_fixtures/lazy-load-jobs-multi002.yaml
tests/yamlparser/job_fixtures/lazy-load-jobs001.yaml
* Parameters with template value using itself were substituted as is.
For example: "timer: '{timer}'" was expanded to "{timer}". Now it
leads to recursive parameter error.
See changes in this test for example:
tests/yamlparser/job_fixtures/parameter_name_reuse_default.*
->
tests/yamlparser/error_fixtures/parameter_name_reuse_default.*
* When job group includes a job which was never declared, it was just
ignored. Now it fails: job is missing.
See changes in this test for example:
tests/yamlparser/job_fixtures/job_group_includes_missing_job.*
->
tests/yamlparser/error_fixtures/job_group_includes_missing_job.*
Change-Id: Ief4e515f065a1b9e0f74fe06d7e94fa77d69f273
80 lines
2.5 KiB
Python
80 lines
2.5 KiB
Python
#!/usr/bin/env python
|
|
# Copyright (C) 2015 Wayne Warren
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import logging
|
|
import sys
|
|
|
|
import jenkins_jobs.cli.subcommand.update as update
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class TestSubCommand(update.UpdateSubCommand):
|
|
def parse_args(self, subparser):
|
|
test = subparser.add_parser("test")
|
|
|
|
self.parse_option_recursive_exclude(test)
|
|
|
|
self.parse_arg_path(test)
|
|
self.parse_arg_names(test)
|
|
|
|
test.add_argument(
|
|
"--config-xml",
|
|
action="store_true",
|
|
dest="config_xml",
|
|
default=False,
|
|
help="use alternative output file layout using config.xml files",
|
|
)
|
|
test.add_argument(
|
|
"-p",
|
|
"--plugin-info",
|
|
dest="plugins_info_path",
|
|
default=None,
|
|
help="path to plugin info YAML file",
|
|
)
|
|
test.add_argument(
|
|
"-o", dest="output_dir", default=sys.stdout, help="path to output XML"
|
|
)
|
|
|
|
def execute(self, options, jjb_config):
|
|
if not options.config_xml:
|
|
logger.warning(
|
|
"(Deprecated) The default output behavior of"
|
|
" `jenkins-jobs test` when given the --output"
|
|
" flag will change in JJB 3.0."
|
|
" Instead of writing jobs to OUTPUT/jobname;"
|
|
" they will be written to OUTPUT/jobname/config.xml."
|
|
" The new behavior can be enabled by the passing"
|
|
" `--config-xml` parameter."
|
|
)
|
|
|
|
builder, xml_jobs, xml_views = self.make_jobs_and_views_xml(
|
|
jjb_config, options.path, options.names
|
|
)
|
|
|
|
builder.update_jobs(
|
|
xml_jobs,
|
|
output=options.output_dir,
|
|
n_workers=1,
|
|
config_xml=options.config_xml,
|
|
)
|
|
builder.update_views(
|
|
xml_views,
|
|
output=options.output_dir,
|
|
n_workers=1,
|
|
config_xml=options.config_xml,
|
|
)
|