ci: arm64 policy - serialise legs, one retry, never drop an existing arm64, ELF check before publish
- max-parallel: 2 on the cac / cac-fpm matrices (8 concurrent QEMU legs failed on 2026-11-19) - ONE retry of a failed arm64 leg (90 s pause) in cac, cac-fpm, shared-httpd - assemble-multiarch-index.sh: --guard-existing-arm64 (fail instead of replacing a multi-arch tag by amd64-only; dispatch input allow_amd64_only overrides) and --verify-bin (ELF machine type of amd64 and arm64 before any tag is written) - tests: assemble-guard.test.sh, wiring tests; docs/arm64-publish-policy.md Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0185ukXi4YX5FxJGqhi6qab6
This commit is contained in:
1 parent
655c88f10b
commit
e1ea28e6a8
5 files changed
+274
-11
No files matched your search
@@ -124,12 +124,57 @@ class Wiring(unittest.TestCase):
|
||||
for j, (repo, _, _) in SLICE.items():
|
||||
st = step(self.jobs[j], 'Assemble')
|
||||
self.assertIn('${{ steps.amd64.outputs.digest }}', st, j)
|
||||
self.assertIn('${{ steps.arm64.outputs.digest }}', st, j)
|
||||
self.assertIn('${{ steps.arm64.outcome }}', st, j)
|
||||
self.assertIn('${{ steps.arm64.outputs.digest || steps.arm64_retry.outputs.digest }}', st, j)
|
||||
self.assertIn("steps.arm64.outcome == 'success' || steps.arm64_retry.outcome == 'success'", st, j)
|
||||
self.assertIn('scripts/assemble-multiarch-index.sh', st, j)
|
||||
self.assertIn('--repo %s/%s' % (REG, repo), st, j)
|
||||
self.assertEqual(st.count('--repo '), 1, j)
|
||||
|
||||
def test_one_retry_of_a_failed_arm64_leg(self):
|
||||
for j in SLICE:
|
||||
job = self.jobs[j]
|
||||
names = [n for n, _ in steps(job)]
|
||||
i = [k for k, n in enumerate(names) if n.startswith('Build arm64')][0]
|
||||
self.assertTrue(names[i + 1].startswith('Wait before arm64 retry'), j)
|
||||
self.assertTrue(names[i + 2].startswith('Retry arm64'), j)
|
||||
self.assertLess(i + 2, [k for k, n in enumerate(names) if n.startswith('Assemble')][0], j)
|
||||
first, retry = step(job, 'Build arm64'), step(job, 'Retry arm64')
|
||||
self.assertIn("if: steps.arm64.outcome == 'failure'", step(job, 'Wait before'), j)
|
||||
self.assertIn("if: steps.arm64.outcome == 'failure'", retry, j)
|
||||
self.assertIn('id: arm64_retry', retry, j)
|
||||
self.assertIn('continue-on-error: true', retry, j)
|
||||
self.assertEqual(len(re.findall(r'Retry arm64', job)), 1, j) # exactly one retry
|
||||
for key in ('timeout-minutes', 'platforms', 'file', 'outputs'):
|
||||
a = re.search(r'(?m)^\s+%s: .*$' % key, first)
|
||||
b = re.search(r'(?m)^\s+%s: .*$' % key, retry)
|
||||
self.assertEqual(a and a.group(0), b and b.group(0), (j, key))
|
||||
ba = lambda x: re.search(r'build-args: \|\n((?: .*\n)+)', x).group(1)
|
||||
self.assertEqual(ba(first), ba(retry), j)
|
||||
|
||||
def test_matrix_families_cap_parallel_qemu_legs(self):
|
||||
for j, (_, _, matrix) in SLICE.items():
|
||||
if matrix:
|
||||
self.assertRegex(self.jobs[j], r'(?m)^ max-parallel: [12]$', j)
|
||||
|
||||
def test_assemble_guard_verify_and_override_wiring(self):
|
||||
want = {'Build-and-Push': ['/usr/sbin/httpd', '/usr/bin/php'],
|
||||
'Build-FPM-Images': ['/usr/sbin/php-fpm', '/usr/bin/php'],
|
||||
'Build-Shared-httpd': ['/usr/sbin/httpd']}
|
||||
for j, bins in want.items():
|
||||
st = step(self.jobs[j], 'Assemble')
|
||||
self.assertIn('--guard-existing-arm64', st, j)
|
||||
self.assertEqual(re.findall(r'--verify-bin (\S+)', st), bins, j)
|
||||
self.assertIn('ALLOW_AMD64_ONLY: ${{ github.event.inputs.allow_amd64_only }}', st, j)
|
||||
run = re.search(r'run: \|\n((?: .*\n?)+)', st).group(1)
|
||||
self.assertNotIn('${{', run, j)
|
||||
|
||||
def test_allow_amd64_only_input_is_a_string_default_false(self):
|
||||
head = TEXT.split('jobs:')[0]
|
||||
m = re.search(r'(?m)^ allow_amd64_only:\n((?: .*\n)+)', head)
|
||||
self.assertIsNotNone(m)
|
||||
self.assertIn("default: 'false'", m.group(1))
|
||||
self.assertIn('type: string', m.group(1))
|
||||
|
||||
def test_tag_scheme_unchanged(self):
|
||||
"""Run the assemble step's shell with a recording stub: exact tags per version."""
|
||||
for j, (repo, _, matrix) in SLICE.items():
|
||||
|
||||
Reference in new issue
Block a user