Skip to content

Commit 2807c0c

Browse files
akerouantonakerouanton
committed
Revert "ci: run integration tests with firewalld enabled"
Temporarily remove firewallds jobs. These are actually not running firewalld due to a typo in GHA definitions. Moreover, these new jobs are putting too much load on the CI, causing GHA cache backend to return 429 for many jobs. This slows down build jobs (as they can't use existing cache), and at least one buildkit test is now failing. This reverts commit 4e567e1. Signed-off-by: Albin Kerouanton <[email protected]>
1 parent 4ade1b1 commit 2807c0c

2 files changed

Lines changed: 8 additions & 50 deletions

File tree

‎.github/workflows/.test.yml‎

Lines changed: 6 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -36,28 +36,13 @@ jobs:
3636
runs-on: ubuntu-20.04
3737
timeout-minutes: 120 # guardrails timeout for the whole job
3838
continue-on-error: ${{ github.event_name != 'pull_request' }}
39-
strategy:
40-
fail-fast: false
41-
matrix:
42-
mode:
43-
- ""
44-
- firewalld
4539
steps:
4640
-
4741
name: Checkout
4842
uses: actions/checkout@v4
4943
-
5044
name: Set up runner
5145
uses: ./.github/actions/setup-runner
52-
-
53-
name: Prepare
54-
run: |
55-
CACHE_DEV_SCOPE=dev
56-
if [[ "${{ matrix.mod }}" == *"firewalld"* ]]; then
57-
echo "DOCKER_FIREWALLD=true" >> $GITHUB_ENV
58-
CACHE_DEV_SCOPE="${CACHE_DEV_SCOPE}firewalld"
59-
fi
60-
echo "CACHE_DEV_SCOPE=${CACHE_DEV_SCOPE}" >> $GITHUB_ENV
6146
-
6247
name: Set up Docker Buildx
6348
uses: docker/setup-buildx-action@v3
@@ -80,18 +65,11 @@ jobs:
8065
name: Prepare reports
8166
if: always()
8267
run: |
83-
reportsName=$(echo -n "${{ matrix.test }}" | sha256sum | cut -d " " -f 1)
84-
if [ -n "${{ matrix.mode }}" ]; then
85-
reportsName="$reportsName-${{ matrix.mode }}"
86-
fi
87-
reportsPath=/tmp/reports/$reportsName
88-
echo "TESTREPORTS_NAME=$reportsName" >> $GITHUB_ENV
89-
90-
mkdir -p bundles $reportsPath
68+
mkdir -p bundles /tmp/reports
9169
find bundles -path '*/root/*overlay2' -prune -o -type f \( -name '*-report.json' -o -name '*.log' -o -name '*.out' -o -name '*.prof' -o -name '*-report.xml' \) -print | xargs sudo tar -czf /tmp/reports.tar.gz
92-
tar -xzf /tmp/reports.tar.gz -C $reportsPath
93-
sudo chown -R $(id -u):$(id -g) $reportsPath
94-
tree -nh $reportsPath
70+
tar -xzf /tmp/reports.tar.gz -C /tmp/reports
71+
sudo chown -R $(id -u):$(id -g) /tmp/reports
72+
tree -nh /tmp/reports
9573
-
9674
name: Send to Codecov
9775
uses: codecov/codecov-action@v4
@@ -105,7 +83,7 @@ jobs:
10583
if: always()
10684
uses: actions/upload-artifact@v4
10785
with:
108-
name: test-reports-unit-${{ inputs.storage }}-${{ env.TESTREPORTS_NAME }}
86+
name: test-reports-unit-${{ inputs.storage }}
10987
path: /tmp/reports/*
11088
retention-days: 1
11189

@@ -127,7 +105,7 @@ jobs:
127105
name: Download reports
128106
uses: actions/download-artifact@v4
129107
with:
130-
pattern: test-reports-unit-${{ inputs.storage }}-*
108+
name: test-reports-unit-${{ inputs.storage }}
131109
path: /tmp/reports
132110
-
133111
name: Install teststat
@@ -241,7 +219,6 @@ jobs:
241219
- ""
242220
- rootless
243221
- systemd
244-
- firewalld
245222
#- rootless-systemd FIXME: https://github.com/moby/moby/issues/44084
246223
steps:
247224
-
@@ -264,10 +241,6 @@ jobs:
264241
echo "SYSTEMD=true" >> $GITHUB_ENV
265242
CACHE_DEV_SCOPE="${CACHE_DEV_SCOPE}systemd"
266243
fi
267-
if [[ "${{ matrix.mod }}" == *"firewalld"* ]]; then
268-
echo "DOCKER_FIREWALLD=true" >> $GITHUB_ENV
269-
CACHE_DEV_SCOPE="${CACHE_DEV_SCOPE}firewalld"
270-
fi
271244
echo "CACHE_DEV_SCOPE=${CACHE_DEV_SCOPE}" >> $GITHUB_ENV
272245
-
273246
name: Set up Docker Buildx
@@ -407,9 +380,6 @@ jobs:
407380
fail-fast: false
408381
matrix:
409382
test: ${{ fromJson(needs.integration-cli-prepare.outputs.matrix) }}
410-
mode:
411-
- ""
412-
- firewalld
413383
steps:
414384
-
415385
name: Checkout
@@ -420,15 +390,6 @@ jobs:
420390
-
421391
name: Set up tracing
422392
uses: ./.github/actions/setup-tracing
423-
-
424-
name: Prepare
425-
run: |
426-
CACHE_DEV_SCOPE=dev
427-
if [[ "${{ matrix.mod }}" == *"firewalld"* ]]; then
428-
echo "DOCKER_FIREWALLD=true" >> $GITHUB_ENV
429-
CACHE_DEV_SCOPE="${CACHE_DEV_SCOPE}firewalld"
430-
fi
431-
echo "CACHE_DEV_SCOPE=${CACHE_DEV_SCOPE}" >> $GITHUB_ENV
432393
-
433394
name: Set up Docker Buildx
434395
uses: docker/setup-buildx-action@v3
@@ -456,9 +417,6 @@ jobs:
456417
if: always()
457418
run: |
458419
reportsName=$(echo -n "${{ matrix.test }}" | sha256sum | cut -d " " -f 1)
459-
if [ -n "${{ matrix.mode }}" ]; then
460-
reportsName="$reportsName-${{ matrix.mode }}"
461-
fi
462420
reportsPath=/tmp/reports/$reportsName
463421
echo "TESTREPORTS_NAME=$reportsName" >> $GITHUB_ENV
464422

‎hack/dind-systemd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fi
5959
# Allow connections coming from the host (through eth0). This is needed to
6060
# access the daemon port (independently of which port is used), or run a
6161
# 'remote' Delve session, etc...
62-
if [ "${DOCKER_FIREWALLD:-}" = "true" ]; then
62+
if [ ${DOCKER_FIREWALLD:-} = "true" ]; then
6363
cat > /etc/firewalld/zones/trusted.xml << EOF
6464
<?xml version="1.0" encoding="utf-8"?>
6565
<zone target="ACCEPT">
@@ -76,7 +76,7 @@ env > /etc/docker-entrypoint-env
7676
cat > /etc/systemd/system/docker-entrypoint.target << EOF
7777
[Unit]
7878
Description=the target for docker-entrypoint.service
79-
Requires=docker-entrypoint.service systemd-logind.service systemd-user-sessions.service $([ "${DOCKER_FIREWALLD:-}" = "true" ] && echo firewalld.service)
79+
Requires=docker-entrypoint.service systemd-logind.service systemd-user-sessions.service $([ ${DOCKER_FIREWALLD:-} = "true" ] && echo firewalld.service)
8080
EOF
8181

8282
quoted_args="$(printf " %q" "${@}")"

0 commit comments

Comments
 (0)