Skip to content

Add version for ingestion dataflow template #518

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
vish-cs merged 1 commit into from
Jun 4, 2026
Merged

Add version for ingestion dataflow template #518

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 14 additions & 3 deletions pipeline/ingestion/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ steps:
- '-pl'
- 'pipeline/ingestion'
- '-am'
- '-Drevision=${_VERSION}'
secretEnv:
- DC_API_KEY
id: 'build-jar'
Expand All @@ -32,6 +33,7 @@ steps:
- '-pl'
- 'pipeline/ingestion'
- '-DtestMode=DATAFLOW'
- '-Drevision=${_VERSION}'
secretEnv:
- DC_API_KEY
id: 'run-dataflow-integration-test'
Expand All @@ -44,9 +46,9 @@ steps:
- 'dataflow'
- 'flex-template'
- 'build'
- 'gs://$_TEMPLATE_BUCKET/templates/flex/ingestion.json'
- 'gs://$_TEMPLATE_BUCKET/templates/flex/ingestion-${_VERSION}.json'
- '--image-gcr-path'
- '${_IMAGE_GCR_PATH}:$SHORT_SHA'
- '${_IMAGE_GCR_PATH}:${_VERSION}'
- '--sdk-language'
- 'JAVA'
- '--flex-template-base-image'
Expand All @@ -59,6 +61,15 @@ steps:
- 'FLEX_TEMPLATE_JAVA_MAIN_CLASS=org.datacommons.ingestion.pipeline.GraphIngestionPipeline'
id: 'build-flex-template'

# 4. Update the "latest" pointer for the workflow default
- name: 'gcr.io/google.com/cloudsdktool/cloud-sdk'
entrypoint: 'gsutil'
args:
- 'cp'
- 'gs://$_TEMPLATE_BUCKET/templates/flex/ingestion-${_VERSION}.json'
- 'gs://$_TEMPLATE_BUCKET/templates/flex/ingestion.json'
id: 'update-latest-template'

availableSecrets:
secretManager:
- versionName: projects/$PROJECT_ID/secrets/dc-api-key/versions/latest
Expand All @@ -67,7 +78,7 @@ options:
logging: CLOUD_LOGGING_ONLY

substitutions:
_VERSION: "0.1-SNAPSHOT"
_VERSION: "$SHORT_SHA"
_TEMPLATE_BUCKET: "datcom-templates"
_IMAGE_GCR_PATH: "us-docker.pkg.dev/datcom-ci/gcr.io/dataflow-templates/ingestion"
_INSTANCE_ID: "datcom-spanner-test"
Expand Down