@hupan56/wlkj 3.1.32 → 3.3.0

package/templates/qoder/scripts/domain/deployment/deploy_to_test.py

@@ -0,0 +1,298 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+deploy_to_test.py - 提交部署: 拉取 → cherry-pick到test分支 → 触发Jenkins构建
+
+面板「提交」按钮调用。在 fywl-ics 代码仓库执行 git 操作。
+
+三步:
+  1. 拉取当前分支最新代码
+  2. cherry-pick 当前提交到 test 分支 (冲突→abort→提示手动)
+  3. 从代码改动推断该构建哪个 Jenkins job → 触发构建
+
+用法:
+  python deploy_to_test.py --json              # 执行全部三步
+  python deploy_to_test.py --json --no-deploy  # 只拉取+cherry-pick, 不触发Jenkins
+  python deploy_to_test.py --jobs              # 列出可选的Jenkins job (供面板展示)
+  python deploy_to_test.py --json --job qas_ics_quality  # 指定构建哪个job
+
+配置 (从 .qoder/config.yaml 读, 没有就用默认):
+  deploy:
+    code_repo: data/code/fywl-ics    # 代码仓库相对路径
+    test_branch: test                # cherry-pick目标分支
+    jenkins_url: http://10.54.6.35:8866
+    jenkins_user: public_ics
+    jenkins_pass: a123456
+    jenkins_view: ICS-QAS            # Jenkins视图名
+
+退出码: 0成功; 3配置错误; 4冲突; 5网络/构建失败
+"""
+import os
+import sys
+import json
+import argparse
+import subprocess
+
+# 路径自举
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_SCRIPTS = os.path.dirname(os.path.dirname(os.path.dirname(_HERE)))  # .qoder/scripts
+_COMMON = os.path.join(_SCRIPTS, 'foundation')
+for _p in (_SCRIPTS, _COMMON):
+    if _p not in sys.path:
+        sys.path.insert(0, _p)
+try:
+    from bootstrap import setup; setup()
+except Exception:
+    pass
+
+
+def _load_config():
+    """从 config.yaml 读 deploy 段, 没有用默认。"""
+    import yaml
+    cfg_path = os.path.join(os.path.dirname(_SCRIPTS), 'config.yaml')
+    defaults = {
+        'code_repo': 'data/code/fywl-ics',
+        'test_branch': 'test',
+        'jenkins_url': 'http://10.54.6.35:8866',
+        'jenkins_user': 'public_ics',
+        'jenkins_pass': 'a123456',
+        'jenkins_view': 'ICS-QAS',
+    }
+    try:
+        with open(cfg_path, encoding='utf-8') as f:
+            full = yaml.safe_load(f) or {}
+        deploy = full.get('deploy', {})
+        defaults.update({k: v for k, v in deploy.items() if v})
+    except Exception:
+        pass
+    return defaults
+
+
+def _git(args, repo_dir, check=True):
+    """在指定仓库目录执行 git 命令。返回 (returncode, stdout, stderr)。"""
+    r = subprocess.run(['git'] + args, capture_output=True, text=True,
+                       cwd=repo_dir, timeout=30)
+    if check and r.returncode != 0:
+        raise RuntimeError('git %s 失败: %s' % (' '.join(args), r.stderr.strip()))
+    return r.returncode, r.stdout.strip(), r.stderr.strip()
+
+
+def _repo_root(cfg):
+    """定位代码仓库根目录。"""
+    from foundation.core.paths import get_repo_root
+    base = get_repo_root()
+    repo = os.path.join(str(base), cfg['code_repo'])
+    if not os.path.isdir(os.path.join(repo, '.git')):
+        # 兜底: 往上找
+        repo = os.path.join(str(base), 'data', 'code', 'fywl-ics')
+    return repo
+
+
+def step_pull(repo_dir):
+    """第1步: 拉取当前分支最新代码。"""
+    _, branch, _ = _git(['branch', '--show-current'], repo_dir)
+    _git(['fetch', 'origin'], repo_dir, check=False)
+    rc, out, err = _git(['pull', 'origin', branch], repo_dir, check=False)
+    if rc != 0:
+        return {'ok': False, 'error': '拉取失败: %s' % err, 'branch': branch}
+    return {'ok': True, 'branch': branch, 'message': '已拉取 %s 分支' % branch}
+
+
+def step_cherry_pick(repo_dir, test_branch):
+    """第2步: cherry-pick 当前提交到 test 分支。冲突→abort→提示手动。"""
+    # 拿当前分支最新 commit
+    _, commit, _ = _git(['rev-parse', 'HEAD'], repo_dir)
+    _, cur_branch, _ = _git(['branch', '--show-current'], repo_dir)
+
+    # 切到 test 分支
+    _git(['fetch', 'origin', test_branch], repo_dir, check=False)
+    rc, out, err = _git(['checkout', test_branch], repo_dir, check=False)
+    if rc != 0:
+        # test 分支不存在, 从 origin 拉远程
+        rc2, out2, err2 = _git(['checkout', '-b', test_branch, 'origin/%s' % test_branch], repo_dir, check=False)
+        if rc2 != 0:
+            return {'ok': False, 'error': '切换test分支失败: %s' % err2}
+
+    _git(['pull', 'origin', test_branch], repo_dir, check=False)
+
+    # cherry-pick
+    rc, out, err = _git(['cherry-pick', commit], repo_dir, check=False)
+    if rc != 0:
+        # 冲突 → abort → 切回原分支 → 提示手动
+        _git(['cherry-pick', '--abort'], repo_dir, check=False)
+        _git(['checkout', cur_branch], repo_dir, check=False)
+        return {'ok': False, 'error': 'cherry-pick 到 %s 分支冲突, 已撤销。请手动解决:\n'
+                '  git checkout %s && git cherry-pick %s' % (test_branch, test_branch, commit[:8]),
+                'conflict': True}
+
+    # 推送
+    rc, out, err = _git(['push', 'origin', test_branch], repo_dir, check=False)
+    if rc != 0:
+        return {'ok': False, 'error': '推送到 %s 失败: %s' % (test_branch, err)}
+
+    # 切回原分支
+    _git(['checkout', cur_branch], repo_dir, check=False)
+
+    return {'ok': True, 'commit': commit[:8], 'test_branch': test_branch,
+            'message': '已 cherry-pick %s 到 %s 并推送' % (commit[:8], test_branch)}
+
+
+def _get_changed_modules(repo_dir):
+    """从 git diff 提取改动的模块名 (用于推断 Jenkins job)。"""
+    _, out, _ = _git(['diff', '--name-only', 'HEAD~1'], repo_dir, check=False)
+    if not out:
+        _, out, _ = _git(['diff', '--name-only', '--cached'], repo_dir, check=False)
+    if not out:
+        _, out, _ = _git(['status', '--porcelain'], repo_dir, check=False)
+    modules = set()
+    for line in out.split('\n'):
+        line = line.strip().split()[-1] if line.strip() else ''
+        if not line:
+            continue
+        # 从路径提取模块: ics-modules/ics-quality/xxx → ics-quality
+        parts = line.split('/')
+        for i, p in enumerate(parts):
+            if p.startswith('ics-') and i + 1 < len(parts):
+                modules.add(p)
+                break
+            # fywl-ui 前端
+            if 'fywl-ui' in line or line.startswith('apps/'):
+                modules.add('ui')
+    return modules
+
+
+def _list_jenkins_jobs(cfg):
+    """拉 Jenkins 视图下的 job 列表。"""
+    import urllib.request, base64
+    url = '%s/view/%s/api/json?tree=jobs[name]' % (cfg['jenkins_url'], cfg['jenkins_view'])
+    req = urllib.request.Request(url)
+    cred = base64.b64encode(('%s:%s' % (cfg['jenkins_user'], cfg['jenkins_pass'])).encode()).decode()
+    req.add_header('Authorization', 'Basic ' + cred)
+    r = urllib.request.urlopen(req, timeout=10)
+    data = json.loads(r.read())
+    return [j['name'] for j in data.get('jobs', [])]
+
+
+def _guess_jobs(modules, all_jobs):
+    """从改动模块推断该构建哪些 Jenkins job。"""
+    matched = []
+    for mod in modules:
+        # 模块名 ics-quality → job名 qas_ics_quality 或 qas-ics-quality
+        mod_norm = mod.replace('-', '_').replace('_', '')
+        for job in all_jobs:
+            job_norm = job.replace('-', '_').replace('_', '').lower()
+            if mod_norm in job_norm:
+                matched.append(job)
+    return list(set(matched))
+
+
+def step_jenkins_build(cfg, job_name):
+    """第3步: 触发 Jenkins 构建。"""
+    import urllib.request, base64
+    # 先拿 crumb (Jenkins CSRF)
+    crumb_url = '%s/crumbIssuer/api/json' % cfg['jenkins_url']
+    cred = base64.b64encode(('%s:%s' % (cfg['jenkins_user'], cfg['jenkins_pass'])).encode()).decode()
+    headers = {'Authorization': 'Basic ' + cred}
+    try:
+        req = urllib.request.Request(crumb_url, headers=headers)
+        crumb_data = json.loads(urllib.request.urlopen(req, timeout=10).read())
+        crumb_field = crumb_data.get('crumbRequestField', '')
+        crumb_value = crumb_data.get('crumb', '')
+        headers[crumb_field] = crumb_value
+    except Exception:
+        pass  # 没 crumb 也试
+
+    build_url = '%s/job/%s/build' % (cfg['jenkins_url'], job_name)
+    req = urllib.request.Request(build_url, data=b'', headers=headers, method='POST')
+    try:
+        r = urllib.request.urlopen(req, timeout=15)
+        return {'ok': True, 'job': job_name, 'message': '已触发 %s 构建 (HTTP %d)' % (job_name, r.status)}
+    except urllib.error.HTTPError as e:
+        if e.code == 201:
+            return {'ok': True, 'job': job_name, 'message': '已触发 %s 构建' % job_name}
+        return {'ok': False, 'error': '触发构建失败 (HTTP %d): %s' % (e.code, str(e)[:60])}
+    except Exception as e:
+        return {'ok': False, 'error': '触发构建异常: %s' % str(e)[:80]}
+
+
+def deploy(job_name=None, skip_deploy=False):
+    """执行部署全流程。返回 (result_dict, exit_code)。"""
+    cfg = _load_config()
+    repo_dir = _repo_root(cfg)
+    if not os.path.isdir(os.path.join(repo_dir, '.git')):
+        return {'ok': False, 'error': '代码仓库不存在: %s' % repo_dir}, 3
+
+    results = {'steps': []}
+
+    # ① 拉取
+    r1 = step_pull(repo_dir)
+    results['steps'].append({'step': 'pull', **r1})
+    if not r1['ok']:
+        return {'ok': False, 'error': r1['error'], 'results': results}, 5
+
+    # ② cherry-pick
+    r2 = step_cherry_pick(repo_dir, cfg['test_branch'])
+    results['steps'].append({'step': 'cherry-pick', **r2})
+    if not r2['ok']:
+        # 冲突不阻塞 Jenkins (开发可能只想先构建), 但标记冲突
+        results['conflict'] = r2.get('conflict', False)
+
+    # ③ Jenkins 构建
+    if not skip_deploy:
+        all_jobs = _list_jenkins_jobs(cfg)
+        if job_name:
+            # 指定了 job
+            r3 = step_jenkins_build(cfg, job_name)
+        else:
+            # 自动推断
+            modules = _get_changed_modules(repo_dir)
+            guessed = _guess_jobs(modules, all_jobs)
+            results['guessed_modules'] = list(modules)
+            results['guessed_jobs'] = guessed
+            if len(guessed) == 1:
+                r3 = step_jenkins_build(cfg, guessed[0])
+            elif len(guessed) > 1:
+                # 多个匹配 → 不自动构建, 让面板让用户选
+                r3 = {'ok': False, 'need_select': True, 'jobs': guessed,
+                      'error': '改动涉及多个模块, 请选择要构建的job: %s' % ', '.join(guessed)}
+            else:
+                # 匹配不到 → 返回全部 job 让用户选
+                r3 = {'ok': False, 'need_select': True, 'jobs': all_jobs,
+                      'error': '无法从改动推断构建模板, 请选择'}
+        results['steps'].append({'step': 'jenkins', **r3})
+
+    return {'ok': not results.get('conflict', False), 'results': results}, 0
+
+
+def main():
+    parser = argparse.ArgumentParser(description='提交部署: 拉取→cherry-pick→Jenkins构建')
+    parser.add_argument('--json', action='store_true', help='JSON输出')
+    parser.add_argument('--no-deploy', action='store_true', help='只拉取+cherry-pick, 不触发Jenkins')
+    parser.add_argument('--job', help='指定构建的Jenkins job名')
+    parser.add_argument('--jobs', action='store_true', help='列出可选的Jenkins job')
+    args = parser.parse_args()
+
+    cfg = _load_config()
+
+    if args.jobs:
+        try:
+            jobs = _list_jenkins_jobs(cfg)
+            result = {'ok': True, 'jobs': jobs}
+            print(json.dumps(result, ensure_ascii=False))
+        except Exception as e:
+            print(json.dumps({'ok': False, 'error': str(e)}))
+        sys.exit(0)
+
+    result, code = deploy(job_name=args.job, skip_deploy=args.no_deploy)
+
+    if args.json:
+        print(json.dumps(result, ensure_ascii=False, default=str))
+    else:
+        for step in result.get('results', {}).get('steps', []):
+            status = 'OK' if step.get('ok') else 'FAIL'
+            print('[%s] %s: %s' % (status, step.get('step'), step.get('message', step.get('error', ''))))
+    sys.exit(code)
+
+
+if __name__ == '__main__':
+    main()