Skip to content

Modify GCS Bucket Name for Nightly Build Jar #196

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

Merged
prashastia merged 6 commits into from
Jan 25, 2025
Merged

Modify GCS Bucket Name for Nightly Build Jar #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f4e7f36
Fix jar name issue.
prashastia Jan 10, 2025
9f77ba8
Check jar name [to be reverted]
prashastia Jan 10, 2025
f30a4da
Modify tests to contain gcs file name instead of jar name.
prashastia Jan 10, 2025
33b0738
Modify tests to contain gcs file name instead of jar name.
prashastia Jan 10, 2025
1670d51
Add snippet to enable Flink Metrics to `README.md`
prashastia Jan 25, 2025
2a653d4
Merge remote-tracking branch 'dataproc/main' into jar-name-fix
prashastia Jan 25, 2025
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
18 changes: 10 additions & 8 deletions cloudbuild/nightly/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ steps:
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'init']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_NAME=${_GCS_JAR_NAME}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'MVN_JAR_LOCATION=${_MVN_JAR_LOCATION}'

# 3.1 Create the dataproc cluster - for small bounded tests
Expand Down Expand Up @@ -106,7 +108,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_bounded_nested_schema_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand All @@ -124,7 +126,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_bounded_table_api_nested_schema_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand All @@ -142,7 +144,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_bounded_table_api_all_datatypes_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand All @@ -160,7 +162,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_bounded_query_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand All @@ -176,7 +178,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_bounded_large_table_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand All @@ -194,7 +196,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_bounded_table_api_large_table_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand All @@ -212,7 +214,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_unbounded_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand All @@ -231,7 +233,7 @@ steps:
entrypoint: 'bash'
args: ['/workspace/cloudbuild/nightly/nightly.sh', 'e2e_table_api_unbounded_test']
env:
- 'GCS_JAR_LOCATION=${_GCS_JAR_LOCATION}'
- 'GCS_JAR_LOCATION_FILE=${_GCS_JAR_LOCATION_FILE}'
- 'PROJECT_ID=${_PROJECT_ID}'
- 'PROJECT_NAME=${_PROJECT_NAME}'
- 'DATASET_NAME=${_WRITE_DATASET_NAME}'
Expand Down
5 changes: 5 additions & 0 deletions cloudbuild/nightly/nightly.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ run_read_only_test(){
# Get the final region and the cluster name.
export REGION=$(cat "$REGION_FILE")
export CLUSTER_NAME=$(cat "$CLUSTER_FILE")
export GCS_JAR_LOCATION=$(cat "$GCS_JAR_LOCATION_FILE")
# Run the simple bounded table test.
source cloudbuild/nightly/scripts/table_read.sh "$PROJECT_ID" "$CLUSTER_NAME" "$REGION" "$PROJECT_NAME" "$DATASET_NAME" "$TABLE_NAME" "$AGG_PROP_NAME" "$QUERY" "$MODE" "$PROPERTIES"
}
Expand Down Expand Up @@ -89,6 +90,7 @@ run_read_write_test(){
# Get the final region and the cluster name.
export REGION=$(cat "$REGION_FILE")
export CLUSTER_NAME=$(cat "$CLUSTER_FILE")
export GCS_JAR_LOCATION=$(cat "$GCS_JAR_LOCATION_FILE")

# Run the test.
source cloudbuild/nightly/scripts/table_write.sh "$PROJECT_ID" "$CLUSTER_NAME" "$REGION" "$PROJECT_NAME" "$DATASET_NAME" "$SOURCE" "$DESTINATION_TABLE_NAME" "$IS_EXACTLY_ONCE_ENABLED" "$MODE" "$PROPERTIES" "$SINK_PARALLELISM" "$IS_SQL" "$ENABLE_TABLE_CREATION"
Expand All @@ -109,8 +111,11 @@ run_read_write_test_delete_cluster(){
case $STEP in
# Download maven and all the dependencies
init)
timestamp=$(date +"%Y%m%d%H%M%S")
export GCS_JAR_LOCATION="$GCS_JAR_LOCATION"/"$timestamp"/"$GCS_JAR_NAME"
$MVN clean install -DskipTests -Pflink_1.17
gcloud storage cp "$MVN_JAR_LOCATION" "$GCS_JAR_LOCATION"
echo "$GCS_JAR_LOCATION" > "$GCS_JAR_LOCATION_FILE"
exit
;;

Expand Down
Loading