Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,13 @@ jobs:
echo "::error file=go.mod::go.mod requires Go $gomod but CI uses Go $GO_VERSION. Update GO_VERSION in .github/workflows/ci.yml."
exit 1
fi
for f in .github/workflows/*.yml; do
v=$(sed -n 's/^ GO_VERSION: "\(.*\)"$/\1/p' "$f")
if [ -n "$v" ] && [ "$v" != "$GO_VERSION" ]; then
echo "::error file=$f::GO_VERSION is $v here but $GO_VERSION in ci.yml; keep them the same."
exit 1
fi
done

- name: golangci-lint
uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0
Expand Down
26 changes: 21 additions & 5 deletions .github/workflows/docker-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,22 @@ on:
branches: [main, master]
# Allow manual trigger
workflow_dispatch:
# nightly.yml calls this with the concurrent tests in group 4. Pushes and pull
# requests leave the inputs empty, which keeps groups 1 to 3 without them.
workflow_call:
inputs:
groups:
description: JSON list of run-tests.sh groups
type: string
default: "[1, 2, 3]"
run-concurrent:
description: Run the tests SKIP_CONCURRENT_TESTS skips
type: boolean
default: false
skip-report:
description: Do not publish the junit report as a check run
type: boolean
default: false

permissions:
contents: read
Expand All @@ -23,7 +39,7 @@ jobs:
fail-fast: false
matrix:
# run-tests.sh in_test_group decides which tests each group runs
group: [1, 2, 3]
group: ${{ fromJSON(inputs.groups || '[1, 2, 3]') }}
permissions:
contents: read
checks: write
Expand Down Expand Up @@ -53,10 +69,10 @@ jobs:

- name: Run multi-node tests
run: |
# Skip concurrent tests in CI - they hang due to resource constraints (see Task #5176)
# These tests pass locally and are covered by VM tests
# Pull requests skip the concurrent tests, which hung on runners (Task #5176);
# the nightly workflow runs them as group 4.
# Export ensures docker-compose can interpolate the variable
export SKIP_CONCURRENT_TESTS="true"
export SKIP_CONCURRENT_TESTS="${{ inputs.run-concurrent && 'false' || 'true' }}"
export TEST_GROUP="${{ matrix.group }}"

# Start the test cluster detached (no --exit-code-from as it implies --abort-on-container-exit)
Expand Down Expand Up @@ -135,7 +151,7 @@ jobs:

- name: Publish Test Report
uses: mikepenz/action-junit-report@6ef3fdcfcd5f0b5d14df3e659ef19b8c6820f93d # v6.6.1
if: always()
if: always() && !inputs.skip-report
with:
report_paths: 'tests/docker/results/junit.xml'
check_name: Docker test report (group ${{ matrix.group }})
Expand Down
Loading
Loading