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

Jump to bottom

Fix hdfs integration test #30458

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Fix hdfs integration test #30458

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
9dd3161
Fix hdfs integration test
Abacn Feb 29, 2024
a350e97
Add back azureIntegrationTest get removed when teardown Py37 support
Abacn Mar 5, 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
Empty file removed .github/trigger_files/beam_PostCommit_Python.json
View file
Open in desktop
Empty file.
3 changes: 1 addition & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,7 @@ tasks.register("python38PostCommit") {
dependsOn(":sdks:python:test-suites:dataflow:py38:postCommitIT")
dependsOn(":sdks:python:test-suites:direct:py38:postCommitIT")
dependsOn(":sdks:python:test-suites:direct:py38:hdfsIntegrationTest")
dependsOn(":sdks:python:test-suites:direct:py38:azureIntegrationTest")
dependsOn(":sdks:python:test-suites:portable:py38:postCommitPy38")
// TODO: https://github.com/apache/beam/issues/22651
// The default container uses Python 3.8. The goal here is to
Expand All @@ -516,7 +517,6 @@ tasks.register("python38PostCommit") {
tasks.register("python39PostCommit") {
dependsOn(":sdks:python:test-suites:dataflow:py39:postCommitIT")
dependsOn(":sdks:python:test-suites:direct:py39:postCommitIT")
dependsOn(":sdks:python:test-suites:direct:py39:hdfsIntegrationTest")
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Changed to run hdfsIntegrationTest only in lowest and highest Python version as the functionality didn't change for long but has a history of broken due to unrelated change. If it is broken at least there are green signal for Python 3.9 / 3.10 so does not undermine other breakage signal

dependsOn(":sdks:python:test-suites:portable:py39:postCommitPy39")
// TODO (https://github.com/apache/beam/issues/23966)
// Move this to Python 3.10 test suite once tfx-bsl has python 3.10 wheel.
Expand All @@ -526,7 +526,6 @@ tasks.register("python39PostCommit") {
tasks.register("python310PostCommit") {
dependsOn(":sdks:python:test-suites:dataflow:py310:postCommitIT")
dependsOn(":sdks:python:test-suites:direct:py310:postCommitIT")
dependsOn(":sdks:python:test-suites:direct:py310:hdfsIntegrationTest")
dependsOn(":sdks:python:test-suites:portable:py310:postCommitPy310")
}

Expand Down
4 changes: 2 additions & 2 deletions sdks/python/apache_beam/io/hdfs_integration_test/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ version: '3'
services:
# HDFS namenode.
namenode:
image: gcr.io/apache-beam-testing/uhopper-hadoop/hadoop-namenode:2.8.1
image: gcr.io/apache-beam-testing/uhopper-hadoop/hadoop-namenode:2.10.2
hostname: namenode
environment:
- CLUSTER_NAME=test
Expand All @@ -30,7 +30,7 @@ services:

# HDFS datanode.
datanode:
image: gcr.io/apache-beam-testing/uhopper-hadoop/hadoop-datanode:2.8.1
image: gcr.io/apache-beam-testing/uhopper-hadoop/hadoop-datanode:2.10.2
hostname: datanode
environment:
- CLUSTER_NAME=test
Expand Down
6 changes: 6 additions & 0 deletions sdks/python/test-suites/direct/common.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,9 @@ tasks.register("directRunnerIT") {
}

tasks.register("hdfsIntegrationTest") {
// needs generated srcs in sdks/python
dependsOn ':sdks:python:sdist'

doLast {
exec {
executable 'sh'
Expand All @@ -191,6 +194,9 @@ tasks.register("hdfsIntegrationTest") {
}

tasks.register("azureIntegrationTest") {
// needs generated srcs in sdks/python
dependsOn ':sdks:python:sdist'

doLast {
exec {
executable 'sh'
Expand Down
Loading