Skip to content

Commit e76b660

Browse files
committed
Ensure image_version is passed to opernshift certification
1 parent ff3b959 commit e76b660

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ on:
2525
required: false
2626
type: string
2727
default: 'ubuntu-24.04'
28+
outputs:
29+
image_version:
30+
value: ${{ jobs.build.outputs.image_version }}
2831

2932
defaults:
3033
run:
@@ -41,6 +44,8 @@ jobs:
4144
packages: write # for docker/build-push-action to push to GHCR
4245
id-token: write # for docker/login to login to NGINX registry
4346
runs-on: ${{ inputs.runner }}
47+
outputs:
48+
image_version: ${{ steps.meta.outputs.version }}
4449
services:
4550
registry:
4651
image: registry:3

.github/workflows/ci.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,10 @@ jobs:
423423
runner: ubuntu-24.04
424424
image: ${{ matrix.image }}
425425
platform: ${{ matrix.platform }}
426+
image_version: >
427+
${{ matrix.image == 'ngf' && needs.build-oss.outputs.image_version
428+
|| matrix.image == 'nginx' && needs.build-oss.outputs.image_version
429+
|| matrix.image == 'operator' && needs.build-operator.outputs.image_version }}
426430
permissions:
427431
contents: read
428432
packages: read

.github/workflows/openshift-certification.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@ jobs:
4040
name: ${{ inputs.image }}-images # or ${{ inputs.image }}-linux-${{ inputs.platform | tr '/' '-' }}
4141

4242
- name: Load image into Docker
43-
run: docker load -i ${{ inputs.image }}-${{ inputs.platform | tr '/' '-' }}.tar
43+
run: |
44+
plat_tag=$(echo "${{ inputs.platform }}" | tr '/' '-')
45+
docker load -i ${{ inputs.image }}-$plat_tag.tar
4446
4547
- name: Retag image for preflight
4648
run: |

0 commit comments

Comments
 (0)