fix(release): 环境固定版本并拆分人工稳定版提升

scripts/test-model-conversion-update.py

@@ -37,7 +37,7 @@ def fixture(base):
     (root / 'scripts/install-infrastructure-update-task.sh').write_text('#!/bin/sh\nexit 0\n')
     (root / 'scripts/Install-InfrastructureUpdateTask.ps1').write_text('# Scheduler transport is verified separately.\n')
     (root / 'data').mkdir()
-    (root / '.env').write_text('SYSTEM_UPDATE_MODE=legacy_watchtower\nNUXT_PUBLIC_BASE_APIURL=http://127.0.0.1:3001\nCONFIG_JWT_SECRET=existing-jwt-secret-that-is-long-enough\nWS_AUTH_WS_TICKET_SECRET=existing-ticket-secret-that-is-long-enough\n')
+    (root / '.env').write_text('VERSION=3.23.0.20261003\nMODEL_CONVERSION_WORKER_VERSION=3.23.0.20261003\nSYSTEM_UPDATE_MODE=legacy_watchtower\nNUXT_PUBLIC_BASE_APIURL=http://127.0.0.1:3001\nCONFIG_JWT_SECRET=existing-jwt-secret-that-is-long-enough\nWS_AUTH_WS_TICKET_SECRET=existing-ticket-secret-that-is-long-enough\n')
     (root / '.gitignore').write_text('.env\n*.log\n')
     commands = base / 'commands.jsonl'
     commands.touch()
@@ -57,6 +57,11 @@ if args[:1] == ['inspect']:
         sys.exit(0)
     sys.exit(1)
 if args[:3] == ['compose', 'config', '--services']: print('easyai-server\\neasyai-web\\nws-gateway\\neasyai-updater\\nmodel-conversion-worker\\nmongo\\nredis')
+elif args[:3] == ['compose', 'config', '--images']:
+    names = {'easyai-server':('SERVER_VERSION','comfy-ai/comfy-server'), 'easyai-web':('WEB_VERSION','comfy-ai/one-ai'), 'ws-gateway':('WS_GATEWAY_VERSION','easyaigc/wsgateway'), 'easyai-updater':('UPDATER_VERSION','easyaigc/easyai-updater'), 'model-conversion-worker':('MODEL_CONVERSION_WORKER_VERSION','easyaigc/model-conversion-worker')}
+    values = dict(line.split('=',1) for line in open('.env').read().splitlines() if '=' in line and not line.startswith('#'))
+    key,image = names[args[-1]]
+    print('registry.cn-shanghai.aliyuncs.com/'+image+':'+('latest' if os.environ.get('UPDATE_TEST_IMAGE_OVERRIDE') == '1' else values[key]))
 elif args[:3] == ['compose', 'ps', '-q']: print('container-' + args[-1])
 sys.exit(0)
 ''')
@@ -105,6 +110,19 @@ with tempfile.TemporaryDirectory(prefix='easyai-conversion-update-') as temporar
         assert original == (root / '.env').read_bytes(), 'repeat changes deployment settings'
         log.write_text('')
         original = (root / '.env').read_bytes()
+        (root / '.env').write_text((root / '.env').read_text().replace('VERSION=3.23.0.20261003', 'VERSION=latest'))
+        rejected_env = (root / '.env').read_bytes()
+        result = run(command, root, env)
+        assert result.returncode != 0 and '固定版本' in result.stdout + result.stderr
+        assert rejected_env == (root / '.env').read_bytes()
+        assert not any(c[:2] in [['compose','pull'],['compose','up']] for c in calls(log))
+        (root / '.env').write_bytes(original)
+        log.write_text('')
+        result = run(command, root, {**env, 'UPDATE_TEST_IMAGE_OVERRIDE':'1'})
+        assert result.returncode != 0 and '有效镜像' in result.stdout + result.stderr
+        assert not any(c[:2] in [['compose','pull'],['compose','up']] for c in calls(log))
+        log.write_text('')
+        original = (root / '.env').read_bytes()
         result = run(command, root, {**env, 'UPDATE_RELEASE_VERSION': 'latest;unsafe'})
         assert result.returncode != 0
         assert original == (root / '.env').read_bytes()
@@ -121,7 +139,16 @@ with tempfile.TemporaryDirectory(prefix='easyai-conversion-update-') as temporar
         result = run(command, root, {**env, 'UPDATE_TEST_UNHEALTHY': '1', 'UPDATE_HEALTH_TIMEOUT_SECONDS': '1'})
         assert result.returncode != 0
         assert '应用更新成功' not in result.stdout
-        if name == 'bash':
+        if name in ('bash','powershell'):
+            log.write_text('')
+            before = dict(line.split('=',1) for line in (root / '.env').read_text().splitlines() if '=' in line and not line.startswith('#'))
+            result = run(command, root, {**env, 'UPDATE_SERVICES':'easyai-server', 'UPDATE_RELEASE_VERSION':'3.25.0.20261009.2'})
+            assert result.returncode == 0, result.stdout + result.stderr
+            after = dict(line.split('=',1) for line in (root / '.env').read_text().splitlines() if '=' in line and not line.startswith('#'))
+            assert after['SERVER_VERSION'] == '3.25.0.20261009.2'
+            assert after['VERSION'] == before['VERSION'] and after['WEB_VERSION'] == before['WEB_VERSION']
+            assert after['MODEL_CONVERSION_WORKER_VERSION'] == before['MODEL_CONVERSION_WORKER_VERSION']
+            assert ['compose','up','-d','--no-deps','easyai-server'] in calls(log)
             log.write_text('')
             result = run(command, root, {**env, 'UPDATE_SERVICES': 'easyai-server easyai-web', 'UPDATE_RELEASE_VERSION': '3.25.0.20261009.3'})
             assert result.returncode == 0, result.stdout + result.stderr
@@ -132,7 +159,7 @@ with tempfile.TemporaryDirectory(prefix='easyai-conversion-update-') as temporar
             assert ['compose', 'up', '-d', '--no-deps', 'easyai-server', 'easyai-web'] in calls(log)
             assert not any('model-conversion-worker' in call for call in calls(log) if call[:2] in [['compose', 'pull'], ['compose', 'up']])
             values = core_values
-            print('bash: core-only release preserves non-target Worker pin passed')
+            print(f'{name}: core-only release preserves non-target Worker pin passed')
             companion_env = {**env, 'UPDATE_SERVICES': 'ws-gateway easyai-updater',
                              'UPDATE_GATEWAY_VERSION': '3.25.0.20261009',
                              'UPDATE_UPDATER_VERSION': '3.25.0.20261009'}
@@ -154,7 +181,7 @@ with tempfile.TemporaryDirectory(prefix='easyai-conversion-update-') as temporar
             assert new_values['VERSION'] == values['VERSION']
             assert new_values['MODEL_CONVERSION_WORKER_VERSION'] == values['MODEL_CONVERSION_WORKER_VERSION']
             assert new_values['CONFIG_JWT_SECRET'] == values['CONFIG_JWT_SECRET']
-            print('bash: independent companion pins preserve non-target versions and reject invalid scope passed')
+            print(f'{name}: independent companion pins preserve non-target versions and reject invalid scope passed')
         print(f'{name}: selected services, stable secret, invalid service and unhealthy Worker passed')
 
     case = base / 'self-update'
@@ -178,7 +205,7 @@ with tempfile.TemporaryDirectory(prefix='easyai-conversion-update-') as temporar
     for args in [['git', 'add', 'update.sh'], ['git', 'commit', '-qm', 'test: 验证更新脚本自更新'], ['git', 'push', '-q', 'origin', 'HEAD']]:
         assert run(args, seed).returncode == 0
     compose_path = root / 'docker-compose.yml'
-    compose_path.write_text(compose_path.read_text().replace('comfy-ai/one-ai:${VERSION}', 'comfy-ai/one-ai@sha256:' + 'a' * 64))
+    compose_path.write_text(compose_path.read_text().replace('comfy-ai/one-ai:${WEB_VERSION:-${VERSION}}', 'comfy-ai/one-ai@sha256:' + 'a' * 64))
     result = run(['bash', 'update.sh'], root, {**env, 'UPDATE_MODE': 'full', 'UPDATE_ADOPT_LEGACY_CONFIG': '1', 'UPDATE_RESTORE_REPOSITORY_IMAGES': 'easyai-web'})
     assert result.returncode == 0, result.stdout + result.stderr
     assert '切换到新版更新脚本' in result.stdout