Skip to content

Fix failure of additional prod image builds in non-main build #38538

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
potiuk merged 1 commit into from
Mar 27, 2024
Merged

Fix failure of additional prod image builds in non-main build #38538

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
1 change: 1 addition & 0 deletions .github/workflows/build-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ jobs:
push-image: "true"
use-uv: "true"
image-tag: ${{ needs.build-info.outputs.image-tag }}
ci-image-tag: ${{ needs.build-info.outputs.image-tag }}
platform: "linux/amd64"
python-versions: ${{ needs.build-info.outputs.python-versions }}
branch: ${{ needs.build-info.outputs.default-branch }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@ jobs:
build-type: "Regular"
do-build: ${{ needs.build-info.outputs.in-workflow-build }}
image-tag: ${{ needs.build-info.outputs.image-tag }}
ci-image-tag: ${{ needs.build-info.outputs.image-tag }}
platform: "linux/amd64"
python-versions: ${{ needs.build-info.outputs.python-versions }}
branch: ${{ needs.build-info.outputs.default-branch }}
Expand Down
20 changes: 6 additions & 14 deletions .github/workflows/prod-image-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ on: # yamllint disable-line rule:truthy
description: "Tag to set for the image"
required: true
type: string
ci-image-tag:
description: "Tag to use for the CI image used during the build"
required: true
type: string
python-versions:
description: "JSON-formatted array of Python versions to build images from"
required: true
Expand Down Expand Up @@ -243,23 +247,11 @@ ${{ inputs.do-build == 'true' && inputs.image-tag || '' }}"
shell: bash
run: echo "${{ env.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
if: inputs.do-build == 'true'
- name: Pull CI images ${{ inputs.python-versions-list-as-string }}:${{ inputs.image-tag }}
- name: Pull CI images ${{ matrix.python-version }}:${{ inputs.ci-image-tag }}
run: >
breeze ci-image pull --tag-as-latest --image-tag "${{ inputs.image-tag }}"
breeze ci-image pull --tag-as-latest --image-tag "${{ inputs.ci-image-tag }}"
--python "${{ matrix.python-version }}"
if: inputs.do-build == 'true' && inputs.build-provider-packages != 'true'
- name: "Prepare chicken-eggs provider packages"
Comment thread
potiuk marked this conversation as resolved.
# In case of provider packages which use latest dev0 version of providers, we should prepare them
# from the source code, not from the PyPI because they have apache-airflow>=X.Y.Z dependency
# And when we prepare them from sources they will have apache-airflow>=X.Y.Z.dev0
run: >
breeze release-management prepare-provider-packages --include-not-ready-providers
--package-format wheel --version-suffix-for-pypi dev0
${{ inputs.chicken-egg-providers }}
if: >
inputs.do-build == 'true' &&
inputs.chicken-egg-providers != '' &&
inputs.build-provider-packages != 'true'
- name: "PyPI constraints"
timeout-minutes: 25
run: >
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/prod-image-extra-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ jobs:
with:
build-type: "Bullseye"
image-tag: bullseye-${{ inputs.image-tag }}
ci-image-tag: ${{ inputs.image-tag }}
debian-version: "bullseye"
python-versions: ${{ inputs.python-versions }}
platform: "linux/amd64"
Expand All @@ -75,6 +76,7 @@ jobs:
with:
build-type: "MySQL Client"
image-tag: mysql-${{ inputs.image-tag }}
ci-image-tag: ${{ inputs.image-tag }}
install-mysql-client-type: "mysql"
python-versions: ${{ inputs.python-versions }}
platform: "linux/amd64"
Expand All @@ -93,6 +95,7 @@ jobs:
with:
build-type: "pip"
image-tag: mysql-${{ inputs.image-tag }}
ci-image-tag: ${{ inputs.image-tag }}
install-mysql-client-type: "mysql"
python-versions: ${{ inputs.python-versions }}
platform: "linux/amd64"
Expand Down