This is an automated email from the ASF dual-hosted git repository.
jasonliu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 9470998c919 Small fixies for system tests in google-provider (#48861)
9470998c919 is described below
commit 9470998c919d6fb575299f0927638351a96b81a9
Author: VladaZakharova <[email protected]>
AuthorDate: Tue Apr 8 11:19:32 2025 +0200
Small fixies for system tests in google-provider (#48861)
Co-authored-by: Ulada Zakharava <[email protected]>
---
.../cloud/cloud_build/example_cloud_build.py | 13 +++++++---
.../cloud/dataflow/example_dataflow_native_java.py | 2 +-
.../cloud/dataplex/example_dataplex_catalog.py | 29 ++++++++++++++--------
3 files changed, 28 insertions(+), 16 deletions(-)
diff --git
a/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py
b/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py
index e20c363634d..57080e9cfc5 100644
---
a/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py
+++
b/providers/google/tests/system/google/cloud/cloud_build/example_cloud_build.py
@@ -60,17 +60,22 @@ CURRENT_FOLDER = Path(__file__).parent
# [START howto_operator_gcp_create_build_from_storage_body]
CREATE_BUILD_FROM_STORAGE_BODY = {
"source": {"storage_source": GCP_SOURCE_ARCHIVE_URL},
- "steps": [{"name": "ubuntu", "args": ["echo", "Hello world", "sleep
200"]}],
+ "steps": [{"name": "ubuntu", "entrypoint": "bash", "args": ["-c", "echo
Hello world && sleep 200"]}],
}
# [END howto_operator_gcp_create_build_from_storage_body]
# [START howto_operator_create_build_from_repo_body]
CREATE_BUILD_FROM_REPO_BODY: dict[str, Any] = {
"source": {"repo_source": {"repo_name": GCP_SOURCE_REPOSITORY_NAME,
"branch_name": "master"}},
- "steps": [{"name": "ubuntu", "args": ["echo", "Hello world", "sleep
200"]}],
+ "steps": [{"name": "ubuntu", "entrypoint": "bash", "args": ["-c", "echo
Hello world && sleep 200"]}],
}
# [END howto_operator_create_build_from_repo_body]
+CREATE_BUILD_FROM_REPO_NO_WAIT_BODY: dict[str, Any] = {
+ "source": {"repo_source": {"repo_name": GCP_SOURCE_REPOSITORY_NAME,
"branch_name": "master"}},
+ "steps": [{"name": "ubuntu", "entrypoint": "bash", "args": ["-c", "echo
Hello world && sleep 300"]}],
+}
+
with DAG(
DAG_ID,
@@ -187,7 +192,7 @@ with DAG(
create_build_without_wait = CloudBuildCreateBuildOperator(
task_id="create_build_without_wait",
project_id=PROJECT_ID,
- build=CREATE_BUILD_FROM_REPO_BODY,
+ build=CREATE_BUILD_FROM_REPO_NO_WAIT_BODY,
wait=False,
)
# [END howto_operator_create_build_without_wait]
@@ -224,7 +229,7 @@ with DAG(
create_build_without_wait = CloudBuildCreateBuildOperator(
task_id="create_build_without_wait",
project_id=PROJECT_ID,
- build=CREATE_BUILD_FROM_REPO_BODY,
+ build=CREATE_BUILD_FROM_REPO_NO_WAIT_BODY,
wait=False,
deferrable=True,
)
diff --git
a/providers/google/tests/system/google/cloud/dataflow/example_dataflow_native_java.py
b/providers/google/tests/system/google/cloud/dataflow/example_dataflow_native_java.py
index 70efb000a6a..e3af8b40cd0 100644
---
a/providers/google/tests/system/google/cloud/dataflow/example_dataflow_native_java.py
+++
b/providers/google/tests/system/google/cloud/dataflow/example_dataflow_native_java.py
@@ -97,7 +97,7 @@ with DAG(
start_java_job_direct_deferrable = BeamRunJavaPipelineOperator(
task_id="start_java_job_direct_deferrable",
- jar=LOCAL_JAR,
+ jar=GCS_JAR,
pipeline_options={
"output": GCS_OUTPUT,
},
diff --git
a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py
b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py
index c1de309ef43..167b3724962 100644
---
a/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py
+++
b/providers/google/tests/system/google/cloud/dataplex/example_dataplex_catalog.py
@@ -269,8 +269,8 @@ with DAG(
search_entry = DataplexCatalogSearchEntriesOperator(
task_id="search_entry",
project_id=PROJECT_ID,
- location="global",
- query="displayname:Display Name",
+ location=GCP_LOCATION,
+ query=f"name={ENTRY_NAME}",
)
# [END howto_operator_dataplex_catalog_search_entry]
@@ -326,15 +326,22 @@ with DAG(
# [END howto_operator_dataplex_catalog_delete_entry]
(
- [
- create_entry_group >> get_entry_group >> update_entry_group >>
delete_entry >> delete_entry_group,
- list_entry_group,
- create_entry_type >> get_entry_type >> update_entry_type >>
update_entry >> delete_entry_type,
- list_entry_type,
- create_aspect_type >> get_aspect_type >> update_aspect_type >>
delete_aspect_type,
- list_aspect_type >> list_entry,
- create_entry_type >> create_entry >> [get_entry, lookup_entry,
search_entry],
- ]
+ create_entry_group
+ >> create_entry_type
+ >> create_aspect_type
+ >> create_entry
+ >> search_entry
+ >> [get_entry_group, get_entry_type, get_aspect_type, get_entry]
+ >> lookup_entry
+ >> [list_entry, list_entry_group, list_entry_type, list_aspect_type]
+ >> update_entry_group
+ >> update_entry_type
+ >> update_entry
+ >> update_aspect_type
+ >> delete_entry
+ >> delete_aspect_type
+ >> delete_entry_type
+ >> delete_entry_group
)
from tests_common.test_utils.watcher import watcher