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

Add scripts to build blocked source entries page #674

Merged
merged 4 commits into from
Sep 26, 2019

Conversation

sloretz
Copy link
Contributor

@sloretz sloretz commented Aug 23, 2019

This also somewhat refactors the blocked releases page generation where convenient for code reuse.

This page shows which repositories need source entries, similar to the blocked releases page. The purpose is to determine which repos need to be worked on next for the Noetic release.

Fix Python 2.7 CI

@sloretz sloretz self-assigned this Aug 23, 2019
Copy link
Member

@dirk-thomas dirk-thomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to group the changes in the following commits so that they can be merged without squashing:

  • any kind of refactorings in status_page.py
  • 1-to-1 copies of existing files (e.g. the templates / files from the blocked releases to the blocked source entries)
  • add the new functions to status_page.py, update copied files, any other kind of changes

@sloretz
Copy link
Contributor Author

sloretz commented Sep 26, 2019

It would be good to group the changes in the following commits so that they can be merged without squashing:

@dirk-thomas Changes re-grouped ( I made sure git diff with the old head showed no differences before force pushing this branch)

  • 1b92242 - Refactor's blocked releases page for code reuse
  • 4f11b47 - Makes Blocked releases page use variables for the buildfarm config URL and branch name
  • 5ba2025 - Copies files from blocked releases page without modifying them
  • a590fd6 - All the changes to add the blocked source entries page
  • b59b1ee - Temporary branch name change. This will be dropped before merging. (Edit: I removed this in the latest force push so it's ready to merge)

Copy link
Member

@dirk-thomas dirk-thomas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes re-grouped

Nice! Even a second review pass was super easy with these 5 commits.

Only a tiny nitpick inline - probably best to squash into the first commit.

maintainers[unreleased_repo_name] = {}
maintainers[unreleased_repo_name].update(pkg_maintainers)
new_maintainers = dict(_maintainers(prev_distribution, pkg_name))
maintainers[unreleased_repo_name].update(new_maintainers)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe eliminate the single use var new_maintainers?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removed single use variable and squashed into first commit fc9041c .

Refactor get_blocked_releases_info() so logic can be reused by the
blocked source entries page.

Signed-off-by: Shane Loretz <[email protected]>
cp ros_buildfarm/templates/status/blocked_releases_page.html.em ros_buildfarm/templates/status/blocked_source_entries_page.html.em
cp ros_buildfarm/templates/status/blocked_releases_page_job.xml.em ros_buildfarm/templates/status/blocked_source_entries_page_job.xml.em
cp ros_buildfarm/templates/status/blocked_releases_page_task.Dockerfile.em ros_buildfarm/templates/status/blocked_source_entries_page_task.Dockerfile.em
cp scripts/status/build_blocked_releases_page.py scripts/status/build_blocked_source_entries_page.py
cp scripts/status/generate_blocked_releases_page_job.py scripts/status/generate_blocked_source_entries_page_job.py
cp scripts/status/run_blocked_releases_page_job.py scripts/status/run_blocked_source_entries_page_job.py

Signed-off-by: Shane Loretz<[email protected]>
Signed-off-by: Shane Loretz <[email protected]>
Adds a page that figures out which repos need source entries based on
the packages and repos released in the previous rosdistro.

Signed-off-by: Shane Loretz<[email protected]>
Signed-off-by: Shane Loretz <[email protected]>
@sloretz sloretz force-pushed the blocked-source-entries branch 2 times, most recently from ea21c99 to a97ec89 Compare September 26, 2019 21:13
@dirk-thomas dirk-thomas merged commit 3def27c into master Sep 26, 2019
@dirk-thomas dirk-thomas deleted the blocked-source-entries branch September 26, 2019 23:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants