screwdriver-api 7.0.173 → 7.0.175

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "screwdriver-api",
-  "version": "7.0.173",
+  "version": "7.0.175",
   "description": "API server for the Screwdriver.cd service",
   "main": "index.js",
   "scripts": {
@@ -105,7 +105,7 @@
     "screwdriver-config-parser": "^10.4.1",
     "screwdriver-coverage-bookend": "^2.0.0",
     "screwdriver-coverage-sonar": "^4.1.1",
-    "screwdriver-data-schema": "^23.2.0",
+    "screwdriver-data-schema": "^23.7.0",
     "screwdriver-datastore-sequelize": "^8.2.0",
     "screwdriver-executor-base": "^9.0.1",
     "screwdriver-executor-docker": "^6.0.0",
@@ -123,8 +123,8 @@
     "screwdriver-scm-github": "^12.6.0",
     "screwdriver-scm-gitlab": "^3.1.0",
     "screwdriver-scm-router": "^7.1.0",
-    "screwdriver-template-validator": "^8.1.0",
-    "screwdriver-workflow-parser": "^4.1.1",
+    "screwdriver-template-validator": "^8.2.0",
+    "screwdriver-workflow-parser": "^4.4.1",
     "sqlite3": "^5.1.4",
     "stream": "0.0.3",
     "tinytim": "^0.1.1",

package/plugins/builds/index.js

@@ -36,7 +36,7 @@ const {
     buildsToRestartFilter,
     trimJobName,
     getParallelBuilds,
-    isStartFromMiddleOfStage,
+    isStartFromMiddleOfCurrentStage,
     Status
 } = require('./triggers/helpers');
 
@@ -118,7 +118,7 @@ async function triggerNextJobs(config, app) {
              */
             if (
                 isOrTrigger(currentEvent.workflowGraph, originalCurrentJobName, trimJobName(nextJobName)) ||
-                isStartFromMiddleOfStage(currentJob.name, currentEvent.startFrom, currentEvent.workflowGraph)
+                isStartFromMiddleOfCurrentStage(currentJob.name, currentEvent.startFrom, currentEvent.workflowGraph)
             ) {
                 nextBuild = await orTrigger.execute(
                     currentEvent,

package/plugins/builds/triggers/helpers.js

@@ -4,9 +4,8 @@ const logger = require('screwdriver-logger');
 const workflowParser = require('screwdriver-workflow-parser');
 const merge = require('lodash.mergewith');
 const schema = require('screwdriver-data-schema');
-const { EXTERNAL_TRIGGER_ALL } = schema.config.regex;
+const { EXTERNAL_TRIGGER_ALL, STAGE_SETUP_PATTERN } = schema.config.regex;
 const { getFullStageJobName } = require('../../helper');
-const STAGE_SETUP_PATTERN = /^stage@([\w-]+)(?::setup)$/;
 
 /**
  * @typedef {import('screwdriver-models').JobFactory} JobFactory
@@ -1074,26 +1073,29 @@ function isStageSetup(jobName) {
 }
 
 /**
- * Check if the job is a stage job
+ * get the stage name of a job
  * @param  {String} jobName                 Job name
  * @param  {Object} workflowGraph           Workflow Graph
- * @return {Boolean}
+ * @return {String}                         Stage name
  */
-function isStageJob(workflowGraph, jobName) {
+function getStageName(workflowGraph, jobName) {
     const jobNode = workflowGraph.nodes.find(n => n.name === jobName);
 
-    return jobNode.stageName !== undefined;
+    return jobNode ? jobNode.stageName : null;
 }
 
 /**
- * Check if the current job is a stage setup and the next job is a non-setup stage job
- * @param {String} triggerJob                Current job
- * @param {String} startFrom                 Next job
+ * Check if the current job is a stage setup and the next job is a non-setup job in the same stage
+ * @param {String} currentJobName            Current job
+ * @param {String} eventStartFrom            Event StartFrom job
  * @param {Object} workflowGraph             Workflow Graph
  * @return {Boolean}
  */
-function isStartFromMiddleOfStage(triggerJob, startFrom, workflowGraph) {
-    return isStageSetup(triggerJob) && !isStageSetup(startFrom) && isStageJob(workflowGraph, startFrom);
+function isStartFromMiddleOfCurrentStage(currentJobName, eventStartFrom, workflowGraph) {
+    const startFromStageName = getStageName(workflowGraph, eventStartFrom);
+    const currentStageName = getStageName(workflowGraph, currentJobName);
+
+    return isStageSetup(currentJobName) && !isStageSetup(eventStartFrom) && startFromStageName === currentStageName;
 }
 
 module.exports = {
@@ -1119,5 +1121,5 @@ module.exports = {
     extractExternalJoinData,
     buildsToRestartFilter,
     trimJobName,
-    isStartFromMiddleOfStage
+    isStartFromMiddleOfCurrentStage
 };