From eebfb9c961462ed0b6ad19d070bbb9b321651d95 Mon Sep 17 00:00:00 2001 From: Vsevolod Fedorov Date: Wed, 12 Apr 2023 11:21:31 +0300 Subject: [PATCH] Do not fail on empty YAML file Change-Id: Ia12862f902c2f0b638fcbff798553ca404d81e24 --- jenkins_jobs/loader.py | 2 ++ tests/yamlparser/job_fixtures/empty_template_file.yaml | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 tests/yamlparser/job_fixtures/empty_template_file.yaml diff --git a/jenkins_jobs/loader.py b/jenkins_jobs/loader.py index d6708d2a9..113266ba2 100644 --- a/jenkins_jobs/loader.py +++ b/jenkins_jobs/loader.py @@ -119,6 +119,8 @@ def load_files(config, roots, path_list): data = loader.load_fp(path) else: data = loader.load_path(path) + if data is None: + continue if not isinstance(data, list): raise JenkinsJobsException( f"The topmost collection must be a list, but is: {data}", diff --git a/tests/yamlparser/job_fixtures/empty_template_file.yaml b/tests/yamlparser/job_fixtures/empty_template_file.yaml new file mode 100644 index 000000000..4dbc92bb0 --- /dev/null +++ b/tests/yamlparser/job_fixtures/empty_template_file.yaml @@ -0,0 +1,2 @@ +# Nothing is here. +# Just check that jenkins-jobs do not fail on YAML file with no contents.