Skip to content

AE-956 [ads] Updated to reflect GHA changes #475

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
gleonard-m merged 2 commits into from
Jan 27, 2026
+38 −38
Merged

AE-956 [ads] Updated to reflect GHA changes #475

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
37416d5
Updated to reflect GHA changes
gleonard-m Jan 27, 2026
4310474
updated ci using ./script/update_ci_config
gleonard-m Jan 27, 2026
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
38 changes: 19 additions & 19 deletions .github/workflows/job-ads-attribution-dap-collector.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v6

- name: Build the Docker image
# yamllint disable
run: |
Expand All @@ -32,27 +31,28 @@ jobs:
- name: Test Code
run: docker run us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest python3 -m pytest

push-job-ads-attribution-dap-collector:
deploy-to-gar-ads-attribution-dap-collector:
name: Deploy ads-attribution-dap-collector to GAR
runs-on: ubuntu-latest
needs: build-job-ads-attribution-dap-collector
needs: [build-job-ads-attribution-dap-collector]
if: github.ref == 'refs/heads/main'
permissions:
id-token: write
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v6

- name: Authenticate to Google Cloud
uses: google-github-actions/auth@v2
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}

- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@v2

- name: Configure Docker for GCR
run: gcloud auth configure-docker

- name: Build Docker image
run: docker build jobs/ads-attribution-dap-collector/ -t gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest

- name: Push to GCR
run: docker push gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest
persist-credentials: false
- name: Build the Docker image
# yamllint disable
run: |
docker build jobs/ads-attribution-dap-collector -t us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
# yamllint enable
- name: Push Docker image latest to GAR
uses: mozilla-it/deploy-actions/docker-push@v4.3.2
with:
project_id: moz-fx-data-artifacts-prod
image_tags: us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
workload_identity_pool_project_number: ${{ vars.GCPV2_WORKLOAD_IDENTITY_POOL_PROJECT_NUMBER }}
service_account_name: docker-etl
38 changes: 19 additions & 19 deletions jobs/ads-attribution-dap-collector/ci_job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
steps:
- name: Checkout code
uses: actions/checkout@v6

- name: Check if job files changed
id: changes
uses: dorny/paths-filter@v3
Expand All @@ -21,27 +20,28 @@
if: steps.changes.outputs.job == 'true'
run: docker run us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest python3 -m pytest

push-job-ads-attribution-dap-collector:
deploy-to-gar-ads-attribution-dap-collector:
name: Deploy ads-attribution-dap-collector to GAR
runs-on: ubuntu-latest
needs: build-job-ads-attribution-dap-collector
needs: [build-job-ads-attribution-dap-collector]
if: github.ref == 'refs/heads/main'
permissions:
id-token: write
contents: read
steps:
- name: Checkout code
uses: actions/checkout@v6

- name: Authenticate to Google Cloud
uses: google-github-actions/auth@v2
with:
credentials_json: ${{ secrets.GCP_CREDENTIALS }}

- name: Set up Cloud SDK
uses: google-github-actions/setup-gcloud@v2

- name: Configure Docker for GCR
run: gcloud auth configure-docker

- name: Build Docker image
run: docker build jobs/ads-attribution-dap-collector/ -t gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest

- name: Push to GCR
run: docker push gcr.io/$${{ secrets.GCP_PROJECT }}/ads-attribution-dap-collector_docker_etl:latest
persist-credentials: false
- name: Build the Docker image
# yamllint disable
run: |
docker build jobs/ads-attribution-dap-collector -t us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
# yamllint enable
- name: Push Docker image latest to GAR
uses: mozilla-it/deploy-actions/docker-push@v4.3.2
with:
project_id: moz-fx-data-artifacts-prod
image_tags: us-docker.pkg.dev/moz-fx-data-artifacts-prod/docker-etl/ads-attribution-dap-collector:latest
workload_identity_pool_project_number: ${{ vars.GCPV2_WORKLOAD_IDENTITY_POOL_PROJECT_NUMBER }}
service_account_name: docker-etl