fix(stage): recreate cached frontend for release provenance
This commit is contained in:
1 parent
6f9529d31f
commit
b3b9e617b5
2 files changed
+55
-3
No files matched your search
@@ -136,5 +136,8 @@ stage_rollout() {
|
||||
echo 'ERROR: backend acceptance failed; maintenance retained' >&2
|
||||
return 1
|
||||
fi
|
||||
docker compose up -d --no-deps frontend_stage
|
||||
# A cached identical frontend image still needs this release's Compose
|
||||
# provenance; stopping/starting alone retains the previous working_dir label.
|
||||
# Keep dependencies untouched and publish only after backend acceptance.
|
||||
docker compose up -d --no-deps --force-recreate frontend_stage
|
||||
}
|
||||
@@ -111,7 +111,7 @@ class RolloutTests(unittest.TestCase):
|
||||
if fail == '1': self.assertNotIn('up -d', trace)
|
||||
else:
|
||||
self.assertLess(trace.index('migrate deploy'), trace.index('up -d --no-deps backend_stage'))
|
||||
self.assertLess(trace.index('exec -T backend_stage'), trace.index('up -d --no-deps frontend_stage'))
|
||||
self.assertLess(trace.index('exec -T backend_stage'), trace.index('up -d --no-deps --force-recreate frontend_stage'))
|
||||
release = releases/sha
|
||||
self.assertEqual(git('rev-parse', 'HEAD', cwd=release), sha)
|
||||
self.assertEqual((release/'.support-chat.env').stat().st_mode & 0o777, 0o600)
|
||||
@@ -125,6 +125,54 @@ class RolloutTests(unittest.TestCase):
|
||||
retry = subprocess.run(['bash', str(deploy), 'develop'], env=env, capture_output=True, text=True)
|
||||
self.assertNotEqual(retry.returncode, 0)
|
||||
|
||||
def test_cached_frontend_is_recreated_with_target_release_provenance(self):
|
||||
import json
|
||||
with tempfile.TemporaryDirectory() as d:
|
||||
base = pathlib.Path(d)
|
||||
target = base/'releases'/('b'*40)
|
||||
target.mkdir(parents=True)
|
||||
state = base/'state.json'
|
||||
# Compose does not recreate an unchanged image/config just because
|
||||
# --project-directory moved. Model that cached-image decision only;
|
||||
# execute the real CI wrapper and rollout, never a Docker daemon.
|
||||
state.write_text(json.dumps({'working_dir': '/releases/'+('a'*40), 'image': 'sha256:cached'}))
|
||||
docker = base/'docker'
|
||||
docker.write_text('''#!/usr/bin/env python3
|
||||
import json, os, pathlib, sys
|
||||
args = sys.argv[1:]
|
||||
with open(os.environ['TRACE'], 'a') as trace:
|
||||
trace.write(json.dumps(args)+'\\n')
|
||||
if 'up' in args and args[-1] == 'frontend_stage':
|
||||
state = pathlib.Path(os.environ['STATE'])
|
||||
container = json.loads(state.read_text())
|
||||
if '--force-recreate' in args:
|
||||
container['working_dir'] = args[args.index('--project-directory')+1]
|
||||
state.write_text(json.dumps(container))
|
||||
''')
|
||||
docker.chmod(0o755)
|
||||
deploy = (ROOT/'scripts/deploy.sh').read_text()
|
||||
wrapper = deploy.split('docker() {', 1)[1].split('# Render privately:', 1)[0]
|
||||
command = 'set -euo pipefail; docker() {'+wrapper+'\nsource scripts/rollout-stage.sh; stage_rollout'
|
||||
result = subprocess.run(['bash', '-c', command], cwd=ROOT, env=dict(
|
||||
os.environ, PATH=d+':'+os.environ['PATH'], TARGET_DIR=str(target),
|
||||
TRACE=str(base/'trace'), STATE=str(state), STAGE_PROVISION_ENABLED='false'),
|
||||
capture_output=True, text=True)
|
||||
self.assertEqual(result.returncode, 0, result.stderr)
|
||||
container = json.loads(state.read_text())
|
||||
self.assertEqual(container['image'], 'sha256:cached')
|
||||
self.assertEqual(container['working_dir'], str(target),
|
||||
'Cached frontend retained stale release provenance')
|
||||
calls = [json.loads(line) for line in (base/'trace').read_text().splitlines()]
|
||||
prefix = ['compose', '-p', 'stage', '--env-file', '/dev/null',
|
||||
'--project-directory', str(target), '-f', str(target/'.stage-compose.json')]
|
||||
self.assertTrue(all(call[:len(prefix)] == prefix for call in calls))
|
||||
starts = [call[len(prefix):] for call in calls if 'up' in call]
|
||||
self.assertEqual(starts, [['up', '-d', '--no-deps', 'backend_stage'],
|
||||
['up', '-d', '--no-deps', '--force-recreate', 'frontend_stage']])
|
||||
health = next(i for i, call in enumerate(calls) if 'exec' in call)
|
||||
frontend = next(i for i, call in enumerate(calls) if 'up' in call and call[-1] == 'frontend_stage')
|
||||
self.assertLess(health, frontend)
|
||||
|
||||
def test_migration_failure_never_starts_apps(self):
|
||||
with tempfile.TemporaryDirectory() as d:
|
||||
docker = pathlib.Path(d)/'docker'
|
||||
@@ -148,5 +196,6 @@ class RolloutTests(unittest.TestCase):
|
||||
trace=pathlib.Path(d+'/trace').read_text()
|
||||
self.assertIn('stop frontend_stage backend_stage',trace)
|
||||
self.assertIn('exec -T backend_stage node',trace)
|
||||
self.assertNotIn('up -d --no-deps frontend_stage',trace)
|
||||
self.assertFalse(any(' up ' in ' '+line+' ' and line.endswith(' frontend_stage')
|
||||
for line in trace.splitlines()), trace)
|
||||
self.assertNotIn('SUCCESS',result.stdout)
|
||||
Reference in new issue
Block a user