Skip to content

Commit b7c9d88

Browse files
authored
Merge pull request #2078 from gooddata/INFRA-4009
feat: incorporate integration tests into check wf
2 parents 6ca874e + f9d501e commit b7c9d88

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

.github/workflows/lcm-pipeline.yaml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,7 @@ jobs:
5656
id: gen-image-tag
5757
run: |
5858
hash=$(date +'%Y%m%d%H%M').${GITHUB_SHA::8}
59-
if [[ "${{ inputs.deploy }}" == "true" ]]; then
60-
prefix=""
61-
else
62-
prefix="dev-"
63-
fi
64-
echo "image_tag=${prefix}${hash}" >> $GITHUB_OUTPUT
59+
echo "image_tag=${hash}" >> $GITHUB_OUTPUT
6560
- name: Read service version
6661
id: read-version
6762
run: |
@@ -132,14 +127,14 @@ jobs:
132127
- name: Build docker image
133128
uses: ./.github/actions/container-build-push
134129
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' || '' }}"
130+
ecr-repos: staging/${{ matrix.component }}
131+
aws-creds-vault-role: ecr-push
132+
aws-creds-vault-path: "secret/data/v3/int/ecr/infra1-user-ecr-rw"
138133
build-tags: |
139-
latest
140134
${{ needs.prepare-build.outputs.image_tag }}
141-
${{ needs.prepare-build.outputs.service_version }}
142-
${{ needs.prepare-build.outputs.service_major_version }}
135+
${{ inputs.deploy && 'latest' || '' }}
136+
${{ inputs.deploy && needs.prepare-build.outputs.service_version || '' }}
137+
${{ inputs.deploy && needs.prepare-build.outputs.service_major_version || '' }}
143138
build-context: ${{ steps.load-config.outputs.CONTAINER_CONTEXT }}
144139
container-file: ${{ steps.get-image-config.outputs.CONTAINER_FILE }}
145140
vault-url: '${{ secrets.VAULT_ADDRESS }}'
@@ -247,12 +242,11 @@ jobs:
247242
pipeline_identifier: ${{ needs.prepare-build.outputs.pipeline_identifier }}
248243

249244
lcm-integration-e2e:
250-
needs: [ prepare-build, build-helmreleases, wait-for-deployment ]
245+
needs: [ prepare-build, register-bricks-staging, build-helmreleases, wait-for-deployment ]
251246
if: |
252247
!cancelled() &&
253248
!contains(needs.*.result, 'failure') &&
254-
needs.build-helmreleases.result == 'success' &&
255-
inputs.deploy
249+
needs.register-bricks-staging.result == 'success'
256250
uses: ./.github/workflows/lcm-integration-e2e.yaml
257251
secrets: inherit
258252
permissions:

0 commit comments

Comments
 (0)