Skip to content

chore(bigquery-etl): [DENG-8804] Use data-artifacts bigquery-etl docker image #2339

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

Draft
scholtzan wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

chore(bigquery-etl): [DENG-8804] Use data-artifacts bigquery-etl docker image #2339

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion dags/bqetl_artifact_deployment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def should_run_deployment(dag_id: str, generate_sql: bool) -> bool:
tags=tags,
params=params,
) as dag:
docker_image = "gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest"
docker_image = "us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest"

skip_if_queued_runs_exist = ShortCircuitOperator(
task_id="skip_if_queued_runs_exist",
Expand Down
2 changes: 1 addition & 1 deletion dags/bqetl_backfill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def generate_backfill_command(**context):
reattach_on_restart=True,
task_id="bqetl_backfill",
arguments=generate_backfill_command(),
image="gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest",
image="us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest",
gcp_conn_id="google_cloud_airflow_gke",
)

Expand Down
2 changes: 1 addition & 1 deletion dags/bqetl_backfill_complete.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"slack_conn_id": SLACK_CONNECTION_ID,
"channel": AUTOMATION_SLACK_CHANNEL,
}
DOCKER_IMAGE = "gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest"
DOCKER_IMAGE = "us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest"

tags = [Tag.ImpactTier.tier_3]

Expand Down
2 changes: 1 addition & 1 deletion dags/bqetl_backfill_initiate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"slack_conn_id": SLACK_CONNECTION_ID,
"channel": AUTOMATION_SLACK_CHANNEL,
}
DOCKER_IMAGE = "gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest"
DOCKER_IMAGE = "us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest"

tags = [Tag.ImpactTier.tier_3]

Expand Down
2 changes: 1 addition & 1 deletion dags/bqetl_dryrun.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def should_dryrun(dag_id: str) -> bool:
doc_md=__doc__,
tags=tags,
) as dag:
docker_image = "gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest"
docker_image = "us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest"

skip_if_queued_runs_exist = ShortCircuitOperator(
task_id="skip_if_queued_runs_exist",
Expand Down
2 changes: 1 addition & 1 deletion dags/microsoft_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
f"sql/moz-fx-data-shared-prod/microsoft_derived/{table}_v1/query.py",
"--date={{ macros.ds_add(ds, -3) }}",
],
image="gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest",
image="us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest",
owner="mhirose@mozilla.com",
email=["mhirose@mozilla.com", "telemetry-alerts@mozilla.com"],
)
2 changes: 1 addition & 1 deletion dags/shredder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
doc_md=docs,
tags=tags,
)
docker_image = "gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest"
docker_image = "us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest"
base_command = [
"script/shredder_delete",
"--state-table=moz-fx-data-shredder.shredder_state.shredder_state",
Expand Down
2 changes: 1 addition & 1 deletion dags/shredder_backfill.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def base_backfill_operator(dry_run):
],
# target_tables will be rendered as a python list
arguments="{{ params.target_tables }}",
image="gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest",
image="us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest",
on_finish_action=OnFinishAction.DELETE_POD.value,
reattach_on_restart=True,
)
Expand Down
2 changes: 1 addition & 1 deletion dags/socorro_import.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
task_id="remove_socorro_crash_bq_table_partition",
gcp_conn_id=bq_gcp_conn_id,
name="remove_socorro_crash_bq_table_partition",
image="gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest",
image="us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest",
arguments=["bq", "rm", "-f", "--table", table_name],
)

Expand Down
2 changes: 1 addition & 1 deletion utils/gcp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

GCP_PROJECT_ID = "moz-fx-data-airflow-gke-prod"
DATAPROC_PROJECT_ID = "airflow-dataproc"
BIGQUERY_ETL_DOCKER_IMAGE = "gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest"
BIGQUERY_ETL_DOCKER_IMAGE = "us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest"


def export_to_parquet(
Expand Down
4 changes: 2 additions & 2 deletions utils/glam_subdags/generate_query.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def generate_and_run_glean_queries(
destination_project_id,
destination_dataset_id="glam_etl",
source_project_id="moz-fx-data-shared-prod",
docker_image="gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest",
docker_image="us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest",
env_vars=None,
**kwargs,
):
Expand Down Expand Up @@ -53,7 +53,7 @@ def generate_and_run_glean_task(
destination_project_id,
destination_dataset_id="glam_etl",
source_project_id="moz-fx-data-shared-prod",
docker_image="gcr.io/moz-fx-data-airflow-prod-88e0/bigquery-etl:latest",
docker_image="us-docker.pkg.dev/moz-fx-data-artifacts-prod/bigquery-etl/bigquery-etl:latest",
env_vars=None,
min_sample_id = 0,
max_sample_id = 99,
Expand Down