screwdriver-api 7.0.38 → 7.0.40
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/plugins/builds/index.js +1 -13
package/package.json
CHANGED
package/plugins/builds/index.js
CHANGED
|
@@ -845,7 +845,7 @@ const buildsPlugin = {
|
|
|
845
845
|
*/
|
|
846
846
|
const isORTrigger = !joinListNames.includes(current.job.name);
|
|
847
847
|
|
|
848
|
-
if (isORTrigger) {
|
|
848
|
+
if (joinListNames.length === 0 || isORTrigger) {
|
|
849
849
|
const internalBuildConfig = {
|
|
850
850
|
jobFactory,
|
|
851
851
|
buildFactory,
|
|
@@ -1048,7 +1048,6 @@ const buildsPlugin = {
|
|
|
1048
1048
|
|
|
1049
1049
|
const joinList = nextJobs[nextJobName].join;
|
|
1050
1050
|
const joinListNames = joinList.map(j => j.name);
|
|
1051
|
-
const isORTrigger = !joinListNames.includes(triggerName);
|
|
1052
1051
|
|
|
1053
1052
|
if (nextBuild) {
|
|
1054
1053
|
// update current build info in parentBuilds
|
|
@@ -1084,17 +1083,6 @@ const buildsPlugin = {
|
|
|
1084
1083
|
});
|
|
1085
1084
|
}
|
|
1086
1085
|
|
|
1087
|
-
if (isORTrigger) {
|
|
1088
|
-
if (!['CREATED', null, undefined].includes(newBuild.status)) {
|
|
1089
|
-
return newBuild;
|
|
1090
|
-
}
|
|
1091
|
-
|
|
1092
|
-
newBuild.status = 'QUEUED';
|
|
1093
|
-
await newBuild.update();
|
|
1094
|
-
|
|
1095
|
-
return newBuild.start();
|
|
1096
|
-
}
|
|
1097
|
-
|
|
1098
1086
|
const { hasFailure, done } = await getParentBuildStatus({
|
|
1099
1087
|
newBuild,
|
|
1100
1088
|
joinListNames,
|