@jira-deploy/core 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jira-deploy/core",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "type": "module",
   "main": "./index.js",
   "repository": {

package/tools/grayrelease.js

@@ -132,7 +132,7 @@ async function findTransitionByName(issueKey, transitionName, jira) {
   ));
 }
 
-async function waitForGrayReleaseResult(issueKey, fieldId, label, jira, onProgress = () => {}) {
+async function waitForGrayReleaseResult(issueKey, fieldId, label, jira, onProgress = () => { }) {
   const intervalMs = getPollIntervalMs();
   const timeoutMs = getPollTimeoutMs();
   const startedAt = Date.now();
@@ -740,6 +740,9 @@ async function executeGrayReleaseDeployFlow(issueKey, ctx) {
   }
 
   log.push(`🚀 開始執行 GrayRelease Deploy - 環境: ${environment.toUpperCase()}`);
+  log.push('  確保每次都會從 build 開始，先執行: Planning');
+  await jira.transitionByName(issueKey, 'Planning');
+  await notifier.notify(issueKey, '確保每次都會從 Planning 開始，準備進入部署流程');
 
   while (true) {
     const issue = await jira.getIssue(issueKey);
@@ -983,7 +986,7 @@ async function executeAutoGrayReleaseFlow(issueKey, options, ctx) {
 
 async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
   const { jira, notifier } = ctx;
-  const needSwitch = await needSwitchExecutionNode(issueKey, systemCode, jira);
+  const needSwitch = await needSwitchExecutionNode(issueKey, systemCode, jira, log);
 
   if (needSwitch) {
     log.push('  執行: Switch Execution Node');
@@ -1011,7 +1014,7 @@ async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
   // 若超時則回傳「部署中」訊息，請使用者稍後繼續。
   // 每 3 分鐘 輪詢一次
   const DEPLOY_WAIT_MS = Math.min(getPollTimeoutMs(), 10 * 60 * 1000);
-  const DEPLOY_POLL_MS = Math.min(getPollIntervalMs(),  3 * 60 * 1000);
+  const DEPLOY_POLL_MS = Math.min(getPollIntervalMs(), 3 * 60 * 1000);
   const deployDeadline = Date.now() + DEPLOY_WAIT_MS;
   let deployCompleted = false;
   let attempts = 0;
@@ -1048,21 +1051,6 @@ async function runGrayReleaseDeployStep(issueKey, systemCode, ctx, log) {
       throw new Error(`GrayRelease Deploy 失敗，${GRAY_RELEASE_FIELD_IDS.deployResult}: ${deployResult}`);
     }
 
-    const transitions = await jira.getTransitions?.(issueKey) ?? [];
-    const toVerifyTrans = transitions.find(
-      (t) => t.name.toLowerCase() === 'to verify',
-    );
-    if (isPassingResult(deployResult) || toVerifyTrans) {
-      log.push('  ✅ Deploy 完成，執行: To Verify');
-      if (toVerifyTrans?.id && jira.transitionById) {
-        await jira.transitionById(issueKey, toVerifyTrans.id);
-      } else {
-        await jira.transitionByName(issueKey, 'To Verify');
-      }
-      await notifier.notify(issueKey, 'Deploy 完成，進入驗證階段');
-      deployCompleted = true;
-      break;
-    }
 
     if (Date.now() >= deployDeadline) {
       break;
@@ -1132,7 +1120,7 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
     await handleSendJabberMessage(
       {
         to: jabberTo,
-        message: `[GrayRelease 簽核通知] ${issueKey} 需要您的簽核。環境: STG\n${process.env.JIRA_BASE_URL}/browse/${issueKey}`,
+        message: `[GrayRelease 簽核通知] ${issueKey} 需要您的簽核。環境: STG，系統: ${systemCode}\n${process.env.JIRA_BASE_URL}/browse/${issueKey}`,
       },
       {},
     );
@@ -1176,7 +1164,7 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
     await handleSendJabberMessage(
       {
         to: jamesJabber,
-        message: `[GrayRelease 簽核通知] ${issueKey} 需要您的簽核並留言確認。環境: UAT\n${process.env.JIRA_BASE_URL}/browse/${issueKey}`,
+        message: `[GrayRelease 簽核通知] ${issueKey} 需要您的簽核並留言確認。環境: UAT，系統: ${systemCode}\n${process.env.JIRA_BASE_URL}/browse/${issueKey}`,
       },
       {},
     );
@@ -1226,7 +1214,7 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
     await handleSendJabberMessage(
       {
         to: solarJabber,
-        message: `[GrayRelease 簽核通知] ${issueKey} 已由 James Yu 確認，需要您的最終簽核。環境: UAT\n${process.env.JIRA_BASE_URL}/browse/${issueKey}`,
+        message: `[GrayRelease 簽核通知] ${issueKey} 已由 James Yu 確認，需要您的最終簽核。環境: UAT，系統: ${systemCode}\n${process.env.JIRA_BASE_URL}/browse/${issueKey}`,
       },
       {},
     );
@@ -1249,7 +1237,7 @@ async function handleGrayReleaseApproval(issueKey, environment, systemCode, ctx)
  * 判斷是否需要執行 Switch Execution Node
  * 規則：查詢同系統上次 CD or GrayRelease 部署的環境群組，若與本次不同則需切換
  */
-async function needSwitchExecutionNode(issueKey, systemCode, jira) {
+async function needSwitchExecutionNode(issueKey, systemCode, jira, log) {
   if (await hasRecentSwitchExecutionNodeComment(issueKey, systemCode, jira)) {
     return false;
   }
@@ -1263,10 +1251,11 @@ async function needSwitchExecutionNode(issueKey, systemCode, jira) {
   const jql_cd = `project = CID AND (issuetype = CD OR issuetype = GrayRelease) AND text ~ "${systemCode}" AND status = Done AND issueKey != "${issueKey}" ORDER BY updated DESC`;
 
   try {
+    log.push(`  before 查詢歷史 CD/GrayRelease 單，判斷是否需要切換 Execution Node`);
     const cdResults = await jira.searchIssues(jql_cd, ['customfield_13436', 'updated'], 1);
+    log.push(`  after 查詢歷史 CD/GrayRelease 單，判斷是否需要切換 Execution Node`, cdResults);
     const cdIssue = cdResults[0] ?? null;
 
-
     // 查不到歷史 → 保守執行 Switch
     if (!cdIssue) {
       return true;
@@ -1290,9 +1279,6 @@ async function waitForSwitchExecutionNode(issueKey, systemCode, jira) {
   const deadline = Date.now() + waitMs;
 
   while (true) {
-    if (await hasRecentSwitchExecutionNodeComment(issueKey, systemCode, jira)) {
-      return;
-    }
 
     if (Date.now() >= deadline) {
       return;

package/tools.test.js

@@ -1634,7 +1634,7 @@ describe('auto_grayrelease — approval payload handling', () => {
       searchIssues: async () => [{ fields: { customfield_13436: { value: 'stg' } } }],
       transitionByName: async (issueKey, transitionName) => {
         calls.transitionByName.push({ issueKey, transitionName });
-        if (transitionName === 'To Verify') {
+        if (transitionName === 'GrayRelease Deploy') {
           status = 'VERIFY';
         }
         return { transitioned: transitionName, toStatus: status };
@@ -1810,7 +1810,7 @@ describe('auto_grayrelease — build/deploy result fields', () => {
     assert.deepEqual(output.nextSteps, ['GrayRelease Build']);
   });
 
-  test('deploy_grayrelease advances Wait for Build via approval without rebuilding', async () => {
+  test('deploy_grayrelease restarts from Planning and advances via approval without rebuilding', async () => {
     useFastPolling();
     let status = 'Wait for Build';
     const transitions = [];
@@ -1837,9 +1837,11 @@ describe('auto_grayrelease — build/deploy result fields', () => {
       searchIssues: async () => [{ fields: { customfield_13436: { value: 'stg' } } }],
       transitionByName: async (_issueKey, transitionName) => {
         transitions.push(transitionName);
+        if (transitionName === 'Planning') status = 'Planning';
+        if (transitionName === 'Accept') status = 'Wait for Build';
         if (transitionName === 'Apply to approval') status = 'Wait Approval';
         if (transitionName === 'Approve') status = 'Wait Deploy';
-        if (transitionName === 'To Verify') status = 'VERIFY';
+        if (transitionName === 'GrayRelease Deploy') status = 'VERIFY';
       },
     };
 
@@ -1854,17 +1856,18 @@ describe('auto_grayrelease — build/deploy result fields', () => {
       const output = JSON.parse(result.content[0].text);
       assert.equal(output.finalStatus, 'VERIFY');
       assert.deepEqual(transitions, [
+        'Planning',
+        'Accept',
         'Apply to approval',
         'Approve',
         'GrayRelease Deploy',
-        'To Verify',
       ]);
     } finally {
       restoreEnv();
     }
   });
 
-  test('deploy_grayrelease stops in VERIFY without rebuilding', async () => {
+  test('deploy_grayrelease keeps rc deploy behavior by resetting from VERIFY to Planning first', async () => {
     const transitions = [];
     const jira = {
       getIssueFields: async () => ({
@@ -1886,8 +1889,8 @@ describe('auto_grayrelease — build/deploy result fields', () => {
     assert.ok(!result.isError, result.content[0].text);
     const output = JSON.parse(result.content[0].text);
     assert.equal(output.finalStatus, 'VERIFY');
-    assert.deepEqual(transitions, []);
-    assert.match(output.log.join('\n'), /若需重 build 請明確執行 build\/rebuild/);
+    assert.deepEqual(transitions, ['Planning']);
+    assert.match(output.log.join('\n'), /確保每次都會從 build 開始/);
   });
 
   test('Build waits until customfield_13432 becomes pass before Apply to approval', async () => {
@@ -1936,7 +1939,7 @@ describe('auto_grayrelease — build/deploy result fields', () => {
     }
   });
 
-  test('Deploy waits until customfield_13433 becomes pass before To Verify', async () => {
+  test('Deploy waits until cid jira worker moves status to VERIFY with pass result', async () => {
     useFastPolling();
     let status = 'WAIT DEPLOY';
     let deployResultCalls = 0;
@@ -1952,13 +1955,15 @@ describe('auto_grayrelease — build/deploy result fields', () => {
           customfield_13443: { value: 'CWA' },
         };
       },
-      getIssue: async () => ({ fields: { status: { name: status }, summary: 'GrayRelease' } }),
+      getIssue: async () => ({
+        fields: {
+          status: { name: deployResultCalls >= 2 ? 'VERIFY' : status },
+          summary: 'GrayRelease',
+        },
+      }),
       searchIssues: async () => [{ fields: { customfield_13436: { value: 'stg' } } }],
       transitionByName: async (_issueKey, transitionName) => {
         transitions.push(transitionName);
-        if (transitionName === 'To Verify') {
-          status = 'VERIFY';
-        }
       },
     };
 
@@ -1971,7 +1976,7 @@ describe('auto_grayrelease — build/deploy result fields', () => {
 
       assert.ok(!result.content[0].text.startsWith('❌'), 'Deploy flow should succeed');
       assert.equal(deployResultCalls, 3);
-      assert.deepEqual(transitions, ['GrayRelease Deploy', 'To Verify']);
+      assert.deepEqual(transitions, ['GrayRelease Deploy']);
     } finally {
       restoreEnv();
     }
@@ -2002,7 +2007,7 @@ describe('auto_grayrelease — build/deploy result fields', () => {
       searchIssues: async () => [{ fields: { customfield_13436: { value: 'prd' } } }],
       transitionByName: async (_issueKey, transitionName) => {
         transitions.push(transitionName);
-        if (transitionName === 'To Verify') {
+        if (transitionName === 'GrayRelease Deploy') {
           status = 'VERIFY';
         }
       },
@@ -2016,7 +2021,7 @@ describe('auto_grayrelease — build/deploy result fields', () => {
       );
 
       assert.ok(!result.content[0].text.startsWith('❌'), 'Deploy flow should succeed');
-      assert.deepEqual(transitions, ['GrayRelease Deploy', 'To Verify']);
+      assert.deepEqual(transitions, ['GrayRelease Deploy']);
     } finally {
       restoreEnv();
     }
@@ -2058,7 +2063,7 @@ describe('auto_grayrelease — build/deploy result fields', () => {
       },
       transitionByName: async (_issueKey, transitionName) => {
         transitions.push(transitionName);
-        if (transitionName === 'To Verify') {
+        if (transitionName === 'GrayRelease Deploy') {
           status = 'VERIFY';
         }
       },
@@ -2073,7 +2078,7 @@ describe('auto_grayrelease — build/deploy result fields', () => {
 
       assert.ok(!result.content[0].text.startsWith('❌'), 'Deploy flow should succeed');
       assert.equal(searchIssuesCalls, 1);
-      assert.deepEqual(transitions, ['Switch Execution Node', 'GrayRelease Deploy', 'To Verify']);
+      assert.deepEqual(transitions, ['Switch Execution Node', 'GrayRelease Deploy']);
     } finally {
       restoreEnv();
     }