Ensure correct tags are passed to preflight job

Author: shaun-nx

.github/workflows/ci.yml

@@ -426,10 +426,13 @@ jobs:
     uses: ./.github/workflows/openshift-certification.yml
     with:
       image: ${{ matrix.image }}
-      image_version: >
-        ${{ matrix.image == 'ngf' && needs.build-oss.outputs.image_version
-        || matrix.image == 'nginx' && needs.build-oss.outputs.image_version
-        || matrix.image == 'operator' && needs.build-operator.outputs.image_version }}
+      if: |
+          (matrix.image == 'operator') ||
+          ((matrix.image == 'ngf' || matrix.image == 'nginx') && contains(
+            matrix.image == 'ngf' && needs.build-oss.outputs.image_version ||
+            matrix.image == 'nginx' && needs.build-oss.outputs.image_version,
+            '-ubi'
+          ))
       tag: ${{ inputs.release_version || '' }}
       dry_run: ${{ inputs.dry_run || false }}
     permissions:

.github/workflows/openshift-certification.yml

@@ -53,9 +53,9 @@ jobs:
         PYXIS_API_TOKEN: ${{ secrets.PYXIS_API_TOKEN }}
       run: |
         if [[ "${{ inputs.image }}" == "ngf" ]]; then
-        IMAGE_PATH="quay.io/${{ github.repository_owner }}/nginx-gateway-fabric:${{ inputs.image_version }}-ubi"
+        IMAGE_PATH="quay.io/${{ github.repository_owner }}/nginx-gateway-fabric:${{ inputs.image_version }}"
         else
-        IMAGE_PATH="quay.io/${{ github.repository_owner }}/nginx-gateway-fabric/${{ inputs.image }}:${{ inputs.image_version }}-ubi"
+        IMAGE_PATH="quay.io/${{ github.repository_owner }}/nginx-gateway-fabric/${{ inputs.image }}:${{ inputs.image_version }}"
         fi
         preflight check container "$IMAGE_PATH" > preflight-result.json