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.

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

Run upload jobs after import_upstream. #843

Merged
merged 1 commit into from
Nov 12, 2020

Conversation

nuclearsandwich
Copy link
Contributor

The import_upstream job does not currently trigger an upload from the
buildfarm repository to the primary packages.ros.org mirrors. This
occassionally causes issues if someone triggering an import after
updating the bootstrap repository fails to return after the import is
complete and trigger the uploads manually.

There's no situation I can see where we would want to update the build
farm repositories from the bootstrap repo without pushing those changes
to the primary mirror and the buildfarm testing and main repositories
should always be in a ready state for sync otherwise since the sync jobs
trigger uploads already so I also don't see a situation where an upload
due to import_upstream would contain ROS packages that were not yet
supposed to be part of the primary mirror in their respective
repositories.

Example diff from a dry-run:

Connecting to Jenkins 'http://build.ros2.org'
Connected to Jenkins version '2.235.2'
Updating job 'upload_main' (dry run)
    <<<
    --- remote config
    +++ new config
    @@ -26 +26 @@
    -      <upstreamProjects>Drel_sync-packages-to-main,Erel_sync-packages-to-main,Frel_sync-packages-to-main,Rrel_sync-packages-to-main</upstreamProjects>
    +      <upstreamProjects>Drel_sync-packages-to-main,Erel_sync-packages-to-main,Frel_sync-packages-to-main,Rrel_sync-packages-to-main,import_upstream</upst
reamProjects>
    >>>
Updating job 'upload_testing' (dry run)
    <<<
    --- remote config
    +++ new config
    @@ -26 +26 @@
    -      <upstreamProjects>Drel_sync-packages-to-testing_bionic_amd64,Drel_sync-packages-to-testing_bionic_arm64,Drel_sync-packages-to-testing_bionic_armhf,
Erel_sync-packages-to-testing_bionic_amd64,Erel_sync-packages-to-testing_bionic_arm64,Erel_sync-packages-to-testing_bionic_armhf,Frel_sync-packages-to-testing
_focal_amd64,Frel_sync-packages-to-testing_focal_arm64,Rrel_sync-packages-to-testing_focal_amd64,Rrel_sync-packages-to-testing_focal_arm64</upstreamProjects>
    +      <upstreamProjects>Drel_sync-packages-to-testing_bionic_amd64,Drel_sync-packages-to-testing_bionic_arm64,Drel_sync-packages-to-testing_bionic_armhf,
Erel_sync-packages-to-testing_bionic_amd64,Erel_sync-packages-to-testing_bionic_arm64,Erel_sync-packages-to-testing_bionic_armhf,Frel_sync-packages-to-testing
_focal_amd64,Frel_sync-packages-to-testing_focal_arm64,Rrel_sync-packages-to-testing_focal_amd64,Rrel_sync-packages-to-testing_focal_arm64,import_upstream</up
streamProjects>
    >>>

This change affects only the generate_release_trigger_upload.py script which is not part of the default configurations and is used on build.ros{,2}.org to trigger a sync to packages.ros.org.

The import_upstream job does not currently trigger an upload from the
buildfarm repository to the primary packages.ros.org mirrors. This
occassionally causes issues if someone triggering an import after
updating the bootstrap repository fails to return after the import is
complete and trigger the uploads manually.

There's no situation I can see where we would want to update the build
farm repositories from the bootstrap repo without pushing those changes
to the primary mirror and the buildfarm testing and main repositories
should always be in a ready state for sync otherwise since the sync jobs
trigger uploads already so I also don't see a situation where an upload
due to import_upstream would contain ROS packages that were not yet
supposed to be part of the primary mirror in their respective
repositories.

Signed-off-by: Steven! Ragnarök <[email protected]>
@nuclearsandwich nuclearsandwich merged commit da6192f into master Nov 12, 2020
@nuclearsandwich nuclearsandwich deleted the trigger-upload-on-import-upstream branch November 12, 2020 01:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants