Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use groovy to reconfigure doc views #224

Merged
merged 1 commit into from
Mar 3, 2016
Merged

use groovy to reconfigure doc views #224

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions ros_buildfarm/doc_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,17 @@ def configure_doc_jobs(

doc_view_name = get_doc_view_name(rosdistro_name, doc_build_name)

# all further configuration will be handled by either the Jenkins API
# or by a generated groovy script
from ros_buildfarm.jenkins import connect
jenkins = connect(config.jenkins_url)

views = []
views.append(configure_doc_view(jenkins, doc_view_name, dry_run=dry_run))
jenkins = connect(config.jenkins_url) if groovy_script is None else False

if groovy_script is not None:
# all further configuration will be handled by the groovy script
jenkins = False
view_configs = {}
views = {}
views[doc_view_name] = configure_doc_view(
jenkins, doc_view_name, dry_run=dry_run)
if not jenkins:
view_configs.update(views)

repo_names = dist_file.repositories.keys()
filtered_repo_names = build_file.filter_repositories(repo_names)
Expand Down Expand Up @@ -113,18 +115,20 @@ def configure_doc_jobs(
print('Removing obsolete doc jobs')
remove_jobs(jenkins, job_prefix, job_names, dry_run=dry_run)
else:
print("Writing groovy script '%s' to reconfigure %d jobs" %
(groovy_script, len(job_configs)))
print(
"Writing groovy script '%s' to reconfigure %d views and %d jobs" %
(groovy_script, len(view_configs), len(job_configs)))
data = {
'dry_run': dry_run,
'expected_num_views': len(view_configs),
'expected_num_jobs': len(job_configs),
'job_prefixes_and_names': {
'doc': (job_prefix, job_names),
}
}
content = expand_template('snippet/reconfigure_jobs.groovy.em', data)
write_groovy_script_and_configs(
groovy_script, content, job_configs)
groovy_script, content, job_configs, view_configs=view_configs)


def configure_doc_job(
Expand Down