screwdriver-api 7.0.258 → 7.0.260

package/.github/ISSUE_TEMPLATE/custom.md

@@ -0,0 +1,14 @@
+---
+name: Custom issue template
+about: Describe this issue template's purpose here.
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**What happened**:
+
+**What you expected to happen**:
+
+**How to reproduce it**:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.258",
+  "version": "7.0.260",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {

package/plugins/builds/triggers/helpers.js

@@ -634,10 +634,22 @@ async function getParentBuildStatus({ newBuild, joinListNames, pipelineId, build
  * @param {String|undefined} arg.pipelineId Pipeline ID
  * @param {String|undefined} arg.stageName Stage name
  * @param {Event} arg.event Event
+ * @param {Build} arg.currentBuild Current build
  * @returns {Promise<Build|null>} The newly updated/created build
  */
-async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, stageName, event }) {
+async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, stageName, event, currentBuild }) {
     if (!done || Status.isStarted(newBuild.status)) {
+        // The virtual job does not inherit metadata because the Launcher is not executed.
+        // Therefore, it is necessary to take over the metadata from the previous build.
+
+        // TODO There is a bug when virtual job requires [a, b] and if "a" and "b" are completed simultaneously.
+        // https://github.com/screwdriver-cd/screwdriver/issues/3287
+        if (isVirtualJob(job) && !hasFreezeWindows(job)) {
+            newBuild.meta = merge({}, newBuild.meta, currentBuild.meta);
+
+            await newBuild.update();
+        }
+
         return null;
     }
 
@@ -661,6 +673,9 @@ async function handleNewBuild({ done, hasFailure, newBuild, job, pipelineId, sta
         newBuild.status = Status.SUCCESS;
         newBuild.statusMessage = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage;
         newBuild.statusMessageType = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType;
+        // The virtual job does not inherit metadata because the Launcher is not executed.
+        // Therefore, it is necessary to take over the metadata from the previous build.
+        newBuild.meta = merge({}, newBuild.meta, currentBuild.meta);
 
         return newBuild.update();
     }

package/plugins/builds/triggers/joinBase.js

@@ -103,7 +103,8 @@ class JoinBase {
             job: nextJob,
             pipelineId,
             stageName: nextJobStageName,
-            event
+            event,
+            currentBuild: this.currentBuild
         });
     }
 }

package/plugins/builds/triggers/orBase.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const merge = require('lodash.mergewith');
 const { createInternalBuild, Status, BUILD_STATUS_MESSAGES, isVirtualJob, hasFreezeWindows } = require('./helpers');
 
 /**
@@ -60,6 +61,7 @@ class OrBase {
                 nextBuild.status = Status.SUCCESS;
                 nextBuild.statusMessage = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage;
                 nextBuild.statusMessageType = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType;
+                nextBuild.meta = merge({}, nextBuild.meta, this.currentBuild.meta);
 
                 return nextBuild.update();
             }
@@ -91,6 +93,7 @@ class OrBase {
             nextBuild.status = Status.SUCCESS;
             nextBuild.statusMessage = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessage;
             nextBuild.statusMessageType = BUILD_STATUS_MESSAGES.SKIP_VIRTUAL_JOB.statusMessageType;
+            nextBuild.meta = merge({}, nextBuild.meta, this.currentBuild.meta);
 
             await nextBuild.update();
         }