Skip to content

Use jenkins ssh-agent for devel job test results upload #1054

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Use jenkins ssh-agent for devel job test results upload #1054

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ce7e88
Add support for additional credential ids.
nuclearsandwich Jun 5, 2024
fa72f79
Use sftp to transfer credentials instead of publish-over-ssh plugin.
nuclearsandwich Jun 5, 2024
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
28 changes: 19 additions & 9 deletions ros_buildfarm/templates/devel/devel_job.xml.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,15 +385,18 @@ if pull_request:
'}',
]),
))
@[ if test_stats_upload_host ]@
@(SNIPPET(
'publisher_publish-over-ssh',
config_name='docs',
remote_directory='%s/devel_jobs/%s' % (rosdistro_name, source_repo_spec.name),
source_files=[
'collated_test_stats/results.yaml'
],
remove_prefix='collated_test_stats',
'builder_shell',
script='\n'.join([
'echo "# BEGIN SECTION: Publish test results"',
'sftp collated_test_stats/results.yaml %s@%s:%s' % (
test_stats_upload_user, test_stats_upload_host,
os.path.join(rosdistro_name, 'devel_jobs', source_repo_spec.name)
),
]),
))@
@[ end if]@
@[end if]@
@[if not pull_request or notify_pull_requests]@
@[ if notify_maintainers]@
Expand Down Expand Up @@ -427,10 +430,17 @@ if pull_request:
@(SNIPPET(
'build-wrapper_timestamper',
))@
@[if git_ssh_credential_id]@
@{
credential_ids = []
if git_ssh_credential_id:
credential_ids.append(git_ssh_credential_id)
if doc_result_credential_id:
credential_ids.append(doc_result_credential_id)
}@
@[if credential_ids]@
@(SNIPPET(
'build-wrapper_ssh-agent',
credential_ids=[git_ssh_credential_id],
credential_ids=credential_ids
))@
@[end if]@
</buildWrappers>
Expand Down