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.

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

Fix java sdk container dependency for Python PostCommit #32900

Merged
merged 2 commits into from
Oct 22, 2024
Merged

Fix java sdk container dependency for Python PostCommit #32900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c9abdc
Fix java sdk container dependency for Python PostCommit
Abacn Oct 22, 2024
47af01e
trigger tests
Abacn Oct 22, 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
2 changes: 1 addition & 1 deletion .github/trigger_files/beam_PostCommit_Python.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"comment": "Modify this file in a trivial way to cause this test suite to run.",
"modification": 4
"modification": 2
}

5 changes: 3 additions & 2 deletions sdks/python/test-suites/portable/common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import org.apache.tools.ant.taskdefs.condition.Os
def pythonRootDir = "${rootDir}/sdks/python"
def pythonVersionSuffix = project.ext.pythonVersion.replace('.', '')
def latestFlinkVersion = project.ext.latestFlinkVersion
def currentJavaVersion = project.ext.currentJavaVersion

ext {
pythonContainerTask = ":sdks:python:container:py${pythonVersionSuffix}:docker"
Expand Down Expand Up @@ -369,7 +370,7 @@ project.tasks.register("postCommitPy${pythonVersionSuffix}IT") {
'setupVirtualenv',
'installGcpTest',
":runners:flink:${latestFlinkVersion}:job-server:shadowJar",
':sdks:java:container:java8:docker',
":sdks:java:container:${currentJavaVersion}:docker",
':sdks:java:testing:kafka-service:buildTestKafkaServiceJar',
':sdks:java:io:expansion-service:shadowJar',
':sdks:java:io:google-cloud-platform:expansion-service:shadowJar',
Expand Down Expand Up @@ -420,7 +421,7 @@ project.tasks.register("xlangSpannerIOIT") {
'setupVirtualenv',
'installGcpTest',
":runners:flink:${latestFlinkVersion}:job-server:shadowJar",
':sdks:java:container:java8:docker',
":sdks:java:container:${currentJavaVersion}:docker",
':sdks:java:io:expansion-service:shadowJar',
':sdks:java:io:google-cloud-platform:expansion-service:shadowJar',
':sdks:java:io:kinesis:expansion-service:shadowJar',
Expand Down
8 changes: 4 additions & 4 deletions website/www/site/content/en/documentation/runtime/environments.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,14 +111,14 @@ This method requires building image artifacts from Beam source. For additional i
cd $BEAM_WORKDIR

# The default repository of each SDK
./gradlew :sdks:java:container:java8:docker
./gradlew :sdks:java:container:java11:docker
./gradlew :sdks:java:container:java17:docker
./gradlew :sdks:java:container:java21:docker
./gradlew :sdks:go:container:docker
./gradlew :sdks:python:container:py38:docker
./gradlew :sdks:python:container:py39:docker
./gradlew :sdks:python:container:py310:docker
./gradlew :sdks:python:container:py311:docker
./gradlew :sdks:python:container:py312:docker

# Shortcut for building all Python SDKs
./gradlew :sdks:python:container:buildAll
Expand Down Expand Up @@ -168,9 +168,9 @@ builds the Python 3.6 container and tags it as `example-repo/beam_python3.6_sdk:
From Beam 2.21.0 and later, a `docker-pull-licenses` flag was introduced to add licenses/notices for third party dependencies to the docker images. For example:

```
./gradlew :sdks:java:container:java8:docker -Pdocker-pull-licenses
./gradlew :sdks:java:container:java11:docker -Pdocker-pull-licenses
```
creates a Java 8 SDK image with appropriate licenses in `/opt/apache/beam/third_party_licenses/`.
creates a Java 11 SDK image with appropriate licenses in `/opt/apache/beam/third_party_licenses/`.

By default, no licenses/notices are added to the docker images.

Expand Down
Loading