Skip to content

Add back docker prune step between python container pushes#28033

Merged
damccorm merged 3 commits intomasterfrom
users/damccorm/addBackOrdering
Aug 17, 2023
Merged

Add back docker prune step between python container pushes#28033
damccorm merged 3 commits intomasterfrom
users/damccorm/addBackOrdering

Conversation

@damccorm
Copy link
Copy Markdown
Contributor

@damccorm damccorm commented Aug 16, 2023

This ordering/intermediate prune on releases got removed in https://github.com/apache/beam/pull/27836/files but the intermediate prune is still needed

Fixes #28030


Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@damccorm
Copy link
Copy Markdown
Contributor Author

R: @lostluck

@github-actions
Copy link
Copy Markdown
Contributor

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control

@codecov
Copy link
Copy Markdown

codecov bot commented Aug 16, 2023

Codecov Report

Merging #28033 (3734130) into master (a3b1d0b) will decrease coverage by 0.01%.
Report is 11 commits behind head on master.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master   #28033      +/-   ##
==========================================
- Coverage   72.32%   72.31%   -0.01%     
==========================================
  Files         678      678              
  Lines       99744    99744              
==========================================
- Hits        72135    72133       -2     
- Misses      26045    26047       +2     
  Partials     1564     1564              
Flag Coverage Δ
go 53.69% <ø> (ø)
python 82.86% <ø> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

see 3 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Copy Markdown
Contributor

@lostluck lostluck left a comment

Choose a reason for hiding this comment

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

LGTM, I'm giving it a go.

@lostluck
Copy link
Copy Markdown
Contributor

https://github.com/apache/beam/actions/runs/5882454184 Running to validate.

@lostluck
Copy link
Copy Markdown
Contributor

FYI: @celeste-zeng as the original author and @tvalentyn as the reviewr of the PR. Apparently the python container ordering there was load bearing.

String cur = "3" + i
String prev = "3" + (i-1)
tasks.register("push" + cur) {
if (cur != "38") {
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

what is special about 38 ?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ok, it's the first one in the chain

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

we should try to hardcode python versions in as few pieces as possible. Ideally, we should have lowest supported and highest supported constant, similar to

final static String LOWEST_SUPPORTED = ALL_SUPPORTED_VERSIONS[0]
. Maybe in top level settings.gradle. Other place that would benefit from this: https://github.com/apache/beam/blob/master/sdks/python/test-suites/gradle.properties . If that's too much hassle right now, consider at least not adding lowest/highest constant in this file, so that we programmatically evaluate line 49.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I extracted to variable constants here to keep the change small since there's a good chance we're cherry picking this

@damccorm damccorm merged commit 8223574 into master Aug 17, 2023
@damccorm damccorm deleted the users/damccorm/addBackOrdering branch August 17, 2023 16:57
damccorm added a commit that referenced this pull request Aug 22, 2023
* Add back docker prune step between python container pushes

* Extract to variables

* Define var inside loop to avoid async race condition
lostluck pushed a commit that referenced this pull request Aug 22, 2023
…28101)

* Add back docker prune step between python container pushes

* Extract to variables

* Define var inside loop to avoid async race condition
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.

[Bug]: Build Release Candidate stage_docker job fails with out of space error.

4 participants