Skip to content

Commit afa4700

Browse files
committed
fix syntax from #345
1 parent 8753253 commit afa4700

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

ros_buildfarm/templates/misc/rosdistro_cache_job.xml.em

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@
103103
@(SNIPPET(
104104
'publisher_groovy-postbuild_reconfigure-updated-repositories',
105105
entry_type='doc',
106-
reconfigure_repo_names=reconfigure_doc_repo_names,
106+
reconfigure_job_names=reconfigure_doc_job_names,
107107
))@
108108
@(SNIPPET(
109109
'publisher_groovy-postbuild_reconfigure-updated-repositories',
110110
entry_type='source',
111-
reconfigure_repo_names=reconfigure_source_repo_names,
111+
reconfigure_job_names=reconfigure_source_job_names,
112112
))@
113113
@(SNIPPET(
114114
'publisher_mailer',

ros_buildfarm/templates/snippet/publisher_groovy-postbuild_reconfigure-updated-repositories.xml.em

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
'import java.util.regex.Pattern',
1111
'import jenkins.model.Jenkins',
1212
'',
13-
'reconfigure_repo_names = []',
13+
'reconfigure_job_names = []',
1414
] +
15-
['reconfigure_repo_names << "%s"' % name for name in reconfigure_repo_names] +
15+
['reconfigure_job_names << "%s"' % name for name in reconfigure_job_names] +
1616
[
1717
'',
1818
'pattern = Pattern.compile(".*- updated \'%s\' entry for repository \'(.+)\'")' % entry_type,

scripts/misc/generate_rosdistro_cache_job.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,21 @@ def get_job_config(args, config):
7070
job_name = '%s_%s' % (group_name, 'reconfigure-jobs')
7171
reconfigure_job_names.append(job_name)
7272

73-
reconfigure_doc_repo_names = []
73+
reconfigure_doc_job_names = []
7474
build_files = get_doc_build_files(config, args.rosdistro_name)
7575
for doc_build_name in sorted(build_files.keys()):
7676
group_name = get_doc_view_name(
7777
args.rosdistro_name, doc_build_name)
7878
job_name = '%s_%s' % (group_name, 'reconfigure-jobs')
79-
reconfigure_doc_repo_names.append(job_name)
79+
reconfigure_doc_job_names.append(job_name)
8080

81-
reconfigure_source_repo_names = []
81+
reconfigure_source_job_names = []
8282
build_files = get_source_build_files(config, args.rosdistro_name)
8383
for source_build_name in sorted(build_files.keys()):
8484
group_name = get_devel_view_name(
8585
args.rosdistro_name, doc_build_name)
8686
job_name = '%s_%s' % (group_name, 'reconfigure-jobs')
87-
reconfigure_source_repo_names.append(job_name)
87+
reconfigure_source_job_names.append(job_name)
8888

8989
job_data = copy.deepcopy(args.__dict__)
9090
job_data.update({
@@ -97,8 +97,8 @@ def get_job_config(args, config):
9797
'repository_args': repository_args,
9898

9999
'reconfigure_job_names': reconfigure_job_names,
100-
'reconfigure_doc_repo_names': reconfigure_doc_repo_names,
101-
'reconfigure_source_repo_names': reconfigure_source_repo_names,
100+
'reconfigure_doc_job_names': reconfigure_doc_job_names,
101+
'reconfigure_source_job_names': reconfigure_source_job_names,
102102

103103
'notification_emails':
104104
config.distributions[args.rosdistro_name]['notification_emails'],

0 commit comments

Comments
 (0)