Skip to content

[BEAM-9778] remove temp directory & add docker-pull-licenses to release scripts#11484

Merged
Hannah-Jiang merged 4 commits intoapache:masterfrom
Hannah-Jiang:license_java_fix
Apr 22, 2020
Merged

[BEAM-9778] remove temp directory & add docker-pull-licenses to release scripts#11484
Hannah-Jiang merged 4 commits intoapache:masterfrom
Hannah-Jiang:license_java_fix

Conversation

@Hannah-Jiang
Copy link
Contributor

Please add a meaningful description for your change here


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

  • Choose reviewer(s) and mention them in a comment (R: @username).
  • Format the pull request title like [BEAM-XXX] Fixes bug in ApproximateQuantiles, where you replace BEAM-XXX with the appropriate JIRA issue, if applicable. This will automatically link the pull request to the issue.
  • 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.

Post-Commit Tests Status (on master branch)

Lang SDK Apex Dataflow Flink Gearpump Samza Spark
Go Build Status --- --- Build Status --- --- Build Status
Java Build Status Build Status Build Status
Build Status
Build Status
Build Status
Build Status
Build Status
Build Status Build Status Build Status
Build Status
Build Status
Python Build Status
Build Status
Build Status
Build Status
--- Build Status
Build Status
Build Status
Build Status
Build Status
--- --- Build Status
XLang --- --- --- Build Status --- --- Build Status

Pre-Commit Tests Status (on master branch)

--- Java Python Go Website
Non-portable Build Status Build Status
Build Status
Build Status Build Status
Portable --- Build Status --- ---

See .test-infra/jenkins/README for trigger phrase, status and link of all Jenkins jobs.

@Hannah-Jiang
Copy link
Contributor Author

Run XVR_Spark PostCommit

@Hannah-Jiang Hannah-Jiang changed the title [BEAM-9778] remove temp directoryf [BEAM-9778] remove temp directory & add docker-pull-licenses to release scripts Apr 22, 2020
@Hannah-Jiang
Copy link
Contributor Author

R: @ibzib

Copy link

@ibzib ibzib left a comment

Choose a reason for hiding this comment

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

Thanks Hannah!

}
}

def Boolean pull_licenses
Copy link

Choose a reason for hiding this comment

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

Why pull this out into a global variable?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

when we pass docker-pull-licenses to :sdks:java:container:docker, generateThirdPartyLicenses task doesn't understand it. In order to pass the tag from docker task to generateThirdPartyLicenses, we need a global value to share it.

Copy link

Choose a reason for hiding this comment

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

I tried changing generateThirdPartyLicenses to read project.rootProject.hasProperty(["docker-pull-licenses"]) directly, and it seemed to work fine when I called ./gradlew :sdks:java:container:docker -Pdocker-pull-licenses.

Copy link

Choose a reason for hiding this comment

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

(Sorry for picking nits by the way, I'm just trying to understand Gradle better 😅)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That was the behavior I observed when I implement it. But yesterday, when I try it again, it didn't work as expected. So I introduced the pull_licenses variable. But today, as you pointed out, I tried again, it worked! I reversed to original code.

@Hannah-Jiang
Copy link
Contributor Author

Run XVR_Spark PostCommit

@Hannah-Jiang
Copy link
Contributor Author

Run XVR_Flink PostCommit

Copy link

@ibzib ibzib left a comment

Choose a reason for hiding this comment

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

LGTM, thanks for fixing :)

@Hannah-Jiang
Copy link
Contributor Author

Run Python PreCommit

@Hannah-Jiang Hannah-Jiang merged commit 8cfc8a8 into apache:master Apr 22, 2020
Hannah-Jiang added a commit to Hannah-Jiang/beam that referenced this pull request Apr 28, 2020
…se scripts (apache#11484)

* remove temp dir

* add urls for fmpp-0.9.14 and jpam-1.1

* add docker-pull-licenses to release scripts
yirutang pushed a commit to yirutang/beam that referenced this pull request Jul 23, 2020
…se scripts (apache#11484)

* remove temp dir

* add urls for fmpp-0.9.14 and jpam-1.1

* add docker-pull-licenses to release scripts
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

Comments