@@ -132,14 +132,14 @@ jobs:
132132 - name : Build docker image
133133 uses : ./.github/actions/container-build-push
134134 with :
135- ecr-repos : ${{ inputs.deploy && format(' staging/{0}', matrix.component) || format('gdc-testing/{0}', matrix.component) }}
136- aws-creds-vault-role : ${{ inputs.deploy && ' ecr-ii- push' || 'ecr-push-testing' }}
137- aws-creds-vault-path : " secret/data/v3/int/ecr/infra1-user-ecr-rw${{ !inputs.deploy && '-testing' || '' }} "
135+ ecr-repos : staging/${{ matrix.component }}
136+ aws-creds-vault-role : ecr-push
137+ aws-creds-vault-path : " secret/data/v3/int/ecr/infra1-user-ecr-rw"
138138 build-tags : |
139- latest
140139 ${{ needs.prepare-build.outputs.image_tag }}
141- ${{ needs.prepare-build.outputs.service_version }}
142- ${{ needs.prepare-build.outputs.service_major_version }}
140+ ${{ inputs.deploy && 'latest' || '' }}
141+ ${{ inputs.deploy && needs.prepare-build.outputs.service_version || '' }}
142+ ${{ inputs.deploy && needs.prepare-build.outputs.service_major_version || '' }}
143143 build-context : ${{ steps.load-config.outputs.CONTAINER_CONTEXT }}
144144 container-file : ${{ steps.get-image-config.outputs.CONTAINER_FILE }}
145145 vault-url : ' ${{ secrets.VAULT_ADDRESS }}'
@@ -247,12 +247,11 @@ jobs:
247247 pipeline_identifier : ${{ needs.prepare-build.outputs.pipeline_identifier }}
248248
249249 lcm-integration-e2e :
250- needs : [ prepare-build, build-helmreleases, wait-for-deployment ]
250+ needs : [ prepare-build, register-bricks-staging, build-helmreleases, wait-for-deployment ]
251251 if : |
252252 !cancelled() &&
253253 !contains(needs.*.result, 'failure') &&
254- needs.build-helmreleases.result == 'success' &&
255- inputs.deploy
254+ needs.register-bricks-staging.result == 'success'
256255 uses : ./.github/workflows/lcm-integration-e2e.yaml
257256 secrets : inherit
258257 permissions :
0 commit comments