@jira-deploy/core 1.0.7 → 1.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jira-deploy/core",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "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();
@@ -983,7 +983,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 +1011,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;
@@ -1132,7 +1132,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 +1176,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 +1226,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 +1249,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 +1263,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 +1291,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;