Skip to content

Commit 66d4150

Browse files
committed
ci(e2e): workflow fixes and cleanups for SDS-only PR\n\n- top-level concurrency + unified job concurrency (head_ref||ref_name) to prevent duplicate runs\n- use DEV_REGISTRY_DOCKER_CFG only; inject into values; login via docker cfg\n- fix Actions 'if' expressions (no secrets.* in if; use env)\n- add Apache-2.0 headers to helper scripts (dmtlint)\n- format ci/dvp-e2e/Taskfile.yaml with repo Prettier (prettier)\n- trim push triggers to ci-e2e-nested-sds only; remove noisy comments
Signed-off-by: Anton Yachmenev <anton.yachmenev@flant.com>
1 parent 22b75f5 commit 66d4150

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

.github/workflows/e2e-matrix.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ on:
3636
permissions:
3737
contents: read
3838

39+
concurrency:
40+
group: e2e-matrix-${{ github.head_ref || github.ref_name }}
41+
cancel-in-progress: true
42+
3943
env:
4044
E2E_K8S_URL: https://api.e2e.virtlab.flant.com
4145

@@ -47,7 +51,7 @@ jobs:
4751
name: Setup Nested Envs
4852
runs-on: ubuntu-latest
4953
concurrency:
50-
group: setup-nested-envs-${{ github.ref }}
54+
group: setup-nested-envs-${{ github.head_ref || github.ref_name }}
5155
cancel-in-progress: true
5256
env:
5357
PROFILE: sds-replicated-volume
@@ -90,14 +94,12 @@ jobs:
9094
runs-on: ubuntu-latest
9195
timeout-minutes: 300
9296
concurrency:
93-
group: prepare-${{ github.ref }}-sds-replicated-volume
97+
group: prepare-${{ github.head_ref || github.ref_name }}-sds-replicated-volume
9498
cancel-in-progress: true
9599
env:
96100
PROFILE: sds-replicated-volume
97101
GO_VERSION: "1.24.6"
98102
TMP_ROOT: ${{ github.workspace }}/ci/dvp-e2e/tmp
99-
LOOP_WEBHOOK: ${{ secrets.LOOP_WEBHOOK_URL || secrets.LOOP_WEBHOOK }}
100-
LOOP_CHANNEL: ${{ secrets.LOOP_CHANNEL || 'test-virtualization-loop-alerts' }} # TODO: replace with channel secret after successful run
101103

102104
outputs:
103105
run_id: ${{ steps.prep.outputs.run_id }}
@@ -200,10 +202,10 @@ jobs:
200202
REGISTRY_DOCKER_CFG="${REGISTRY_DOCKER_CFG}" scripts/inject_registry_cfg.sh -f "$VALS" -v "$REGISTRY_DOCKER_CFG"
201203
202204
- name: Docker login from DEV_REGISTRY_DOCKER_CFG (optional)
203-
if: ${{ secrets.DEV_REGISTRY_DOCKER_CFG != '' }}
205+
if: ${{ env.REGISTRY_DOCKER_CFG != '' }}
204206
run: |
205207
set -euo pipefail
206-
cfg=$(printf '%s' '${{ secrets.DEV_REGISTRY_DOCKER_CFG }}' | base64 -d)
208+
cfg=$(printf '%s' "$REGISTRY_DOCKER_CFG" | base64 -d)
207209
reg_list=$(printf '%s' "$cfg" | jq -r '.auths | keys[]')
208210
for reg in $reg_list; do
209211
auth=$(printf '%s' "$cfg" | jq -r --arg r "$reg" '.auths[$r].auth // ""')

0 commit comments

Comments
 (0)