screwdriver-data-schema 25.1.1 → 25.1.3
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/config/base.js +6 -4
- package/config/regex.js +1 -1
- package/package.json +1 -1
package/config/base.js
CHANGED
|
@@ -37,13 +37,14 @@ const SCHEMA_CHILD_PIPELINES = Joi.object()
|
|
|
37
37
|
startAll: Joi.boolean()
|
|
38
38
|
})
|
|
39
39
|
.unknown(false);
|
|
40
|
-
const
|
|
40
|
+
const SCHEMA_SETUP_JOB = Job.job.keys({ requires: Joi.forbidden() });
|
|
41
|
+
const SCHEMA_TEARDOWN_JOB = Job.job.keys({ requires: Joi.forbidden(), sourcePaths: Joi.forbidden() });
|
|
41
42
|
const SCHEMA_STAGE = Joi.object()
|
|
42
43
|
.keys({
|
|
43
44
|
description: Joi.string(),
|
|
44
45
|
jobs: Joi.array().items(Job.jobName).min(0),
|
|
45
|
-
setup:
|
|
46
|
-
teardown:
|
|
46
|
+
setup: SCHEMA_SETUP_JOB,
|
|
47
|
+
teardown: SCHEMA_TEARDOWN_JOB,
|
|
47
48
|
requires: Job.requires,
|
|
48
49
|
sourcePaths: Job.sourcePaths
|
|
49
50
|
})
|
|
@@ -123,7 +124,8 @@ module.exports = {
|
|
|
123
124
|
childPipelines: SCHEMA_CHILD_PIPELINES,
|
|
124
125
|
configBeforeMergingTemplate: SCHEMA_CONFIG_PRE_TEMPLATE_MERGE,
|
|
125
126
|
configAfterMergingTemplate: SCHEMA_CONFIG_POST_TEMPLATE_MERGE,
|
|
126
|
-
|
|
127
|
+
stageSetupJob: SCHEMA_SETUP_JOB,
|
|
128
|
+
stageTeardownJob: SCHEMA_TEARDOWN_JOB,
|
|
127
129
|
stage: SCHEMA_STAGE,
|
|
128
130
|
stages: SCHEMA_STAGES,
|
|
129
131
|
subscribe: SCHEMA_SUBSCRIBE
|
package/config/regex.js
CHANGED
|
@@ -67,7 +67,7 @@ module.exports = {
|
|
|
67
67
|
EXTERNAL_TRIGGER_AND: /^sd@(\d+):(?:([\w-]+)|(stage@([\w-]+):setup))$/,
|
|
68
68
|
// External trigger (OR and AND case)
|
|
69
69
|
// Can be ~sd@123:component or sd@123:component
|
|
70
|
-
EXTERNAL_TRIGGER_ALL: /^~?sd@(\d+):(
|
|
70
|
+
EXTERNAL_TRIGGER_ALL: /^~?sd@(\d+):(([\w-]+)|(stage@([\w-]+):setup))$/,
|
|
71
71
|
|
|
72
72
|
// Can be ~pr, ~commit, ~release, ~tag or ~commit:branchName, or ~sd@123:component
|
|
73
73
|
// Note: if you modify this regex, you must modify `sdJoi` definition in the `config/job.js`
|