From 32651650f03d8e807781cd31b4a7504bdd9f7689 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Mon, 3 Oct 2016 14:03:04 -0700 Subject: [PATCH] fix syntax from #345 --- .../templates/misc/rosdistro_cache_job.xml.em | 4 ++-- ...stbuild_reconfigure-updated-repositories.xml.em | 4 ++-- scripts/misc/generate_rosdistro_cache_job.py | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ros_buildfarm/templates/misc/rosdistro_cache_job.xml.em b/ros_buildfarm/templates/misc/rosdistro_cache_job.xml.em index 08579b4c3..a2dfbe7b8 100644 --- a/ros_buildfarm/templates/misc/rosdistro_cache_job.xml.em +++ b/ros_buildfarm/templates/misc/rosdistro_cache_job.xml.em @@ -103,12 +103,12 @@ @(SNIPPET( 'publisher_groovy-postbuild_reconfigure-updated-repositories', entry_type='doc', - reconfigure_repo_names=reconfigure_doc_repo_names, + reconfigure_job_names=reconfigure_doc_job_names, ))@ @(SNIPPET( 'publisher_groovy-postbuild_reconfigure-updated-repositories', entry_type='source', - reconfigure_repo_names=reconfigure_source_repo_names, + reconfigure_job_names=reconfigure_source_job_names, ))@ @(SNIPPET( 'publisher_mailer', diff --git a/ros_buildfarm/templates/snippet/publisher_groovy-postbuild_reconfigure-updated-repositories.xml.em b/ros_buildfarm/templates/snippet/publisher_groovy-postbuild_reconfigure-updated-repositories.xml.em index 4406d80ef..93c67fb05 100644 --- a/ros_buildfarm/templates/snippet/publisher_groovy-postbuild_reconfigure-updated-repositories.xml.em +++ b/ros_buildfarm/templates/snippet/publisher_groovy-postbuild_reconfigure-updated-repositories.xml.em @@ -10,9 +10,9 @@ 'import java.util.regex.Pattern', 'import jenkins.model.Jenkins', '', - 'reconfigure_repo_names = []', + 'reconfigure_job_names = []', ] + - ['reconfigure_repo_names << "%s"' % name for name in reconfigure_repo_names] + + ['reconfigure_job_names << "%s"' % name for name in reconfigure_job_names] + [ '', 'pattern = Pattern.compile(".*- updated \'%s\' entry for repository \'(.+)\'")' % entry_type, diff --git a/scripts/misc/generate_rosdistro_cache_job.py b/scripts/misc/generate_rosdistro_cache_job.py index 64b14044c..b08ecb481 100755 --- a/scripts/misc/generate_rosdistro_cache_job.py +++ b/scripts/misc/generate_rosdistro_cache_job.py @@ -70,21 +70,21 @@ def get_job_config(args, config): job_name = '%s_%s' % (group_name, 'reconfigure-jobs') reconfigure_job_names.append(job_name) - reconfigure_doc_repo_names = [] + reconfigure_doc_job_names = [] build_files = get_doc_build_files(config, args.rosdistro_name) for doc_build_name in sorted(build_files.keys()): group_name = get_doc_view_name( args.rosdistro_name, doc_build_name) job_name = '%s_%s' % (group_name, 'reconfigure-jobs') - reconfigure_doc_repo_names.append(job_name) + reconfigure_doc_job_names.append(job_name) - reconfigure_source_repo_names = [] + reconfigure_source_job_names = [] build_files = get_source_build_files(config, args.rosdistro_name) for source_build_name in sorted(build_files.keys()): group_name = get_devel_view_name( - args.rosdistro_name, doc_build_name) + args.rosdistro_name, source_build_name) job_name = '%s_%s' % (group_name, 'reconfigure-jobs') - reconfigure_source_repo_names.append(job_name) + reconfigure_source_job_names.append(job_name) job_data = copy.deepcopy(args.__dict__) job_data.update({ @@ -97,8 +97,8 @@ def get_job_config(args, config): 'repository_args': repository_args, 'reconfigure_job_names': reconfigure_job_names, - 'reconfigure_doc_repo_names': reconfigure_doc_repo_names, - 'reconfigure_source_repo_names': reconfigure_source_repo_names, + 'reconfigure_doc_job_names': reconfigure_doc_job_names, + 'reconfigure_source_job_names': reconfigure_source_job_names, 'notification_emails': config.distributions[args.rosdistro_name]['notification_emails'],