screwdriver-data-schema 25.7.0 → 25.9.0
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/annotations.js +3 -0
- package/config/regex.js +8 -4
- package/package.json +1 -1
package/config/annotations.js
CHANGED
|
@@ -19,6 +19,9 @@ const RESERVED_JOB_ANNOTATIONS = [
|
|
|
19
19
|
'screwdriver.cd/dockerEnabled',
|
|
20
20
|
'screwdriver.cd/dockerCpu',
|
|
21
21
|
'screwdriver.cd/dockerRam',
|
|
22
|
+
'screwdriver.cd/rootlessBuildkitEnabled',
|
|
23
|
+
'screwdriver.cd/buildkitCpu',
|
|
24
|
+
'screwdriver.cd/buildkitRam',
|
|
22
25
|
'screwdriver.cd/coverageScope',
|
|
23
26
|
'screwdriver.cd/terminationGracePeriodSeconds',
|
|
24
27
|
'screwdriver.cd/displayName',
|
package/config/regex.js
CHANGED
|
@@ -44,17 +44,19 @@ module.exports = {
|
|
|
44
44
|
// Also allow stage setup/teardown like stage@stage-name:setup
|
|
45
45
|
JOB_NAME: /^(([\w-]+)|(?:stage@([\w-]+):(setup|teardown)))$/,
|
|
46
46
|
// PR JOB Name can only be PR-1 or PR-1:main, group1: PR-prNum, group2: jobName
|
|
47
|
-
PR_JOB_NAME: /^(PR-\d+)(?::([\w-]+))?$/,
|
|
47
|
+
PR_JOB_NAME: /^(PR-\d+)(?::([\w-]+|stage@[\w-]+:[\w-]+))?$/,
|
|
48
48
|
// Stage setup or teardown job name. Can be stage@stage-name:setup or stage@stage-name:teardown
|
|
49
|
-
STAGE_SETUP_TEARDOWN_JOB_NAME: /^stage@([\w-]+):(setup|teardown)$/,
|
|
49
|
+
STAGE_SETUP_TEARDOWN_JOB_NAME: /^(?:PR-\d+:)?stage@([\w-]+):(setup|teardown)$/,
|
|
50
50
|
// Match all possible job name
|
|
51
51
|
ALL_JOB_NAME: /^(PR-[0-9]+:)?[\w-@:]+$/,
|
|
52
52
|
// Internal trigger like ~component or ~main
|
|
53
53
|
INTERNAL_TRIGGER: /^~([\w-]+)$/,
|
|
54
54
|
// Stages can only be named with A-Z,a-z,0-9,-,_
|
|
55
55
|
STAGE_NAME: /^[\w-]+$/,
|
|
56
|
+
// Stages can only be named with A-Z,a-z,0-9,-,_
|
|
57
|
+
PR_STAGE_NAME: /^(PR-\d+):([\w-]+)$/,
|
|
56
58
|
// Stage name prefixed with @stage. Ex: stage@prod
|
|
57
|
-
QUALIFIED_STAGE_NAME: /^stage@([\w-]+)$/,
|
|
59
|
+
QUALIFIED_STAGE_NAME: /^(?:PR-\d+:)?stage@([\w-]+)$/,
|
|
58
60
|
// Stage trigger like ~stage@deploy or ~stage@stageName:jobName or stage@deploy or stage@stageName:jobName
|
|
59
61
|
STAGE_TRIGGER: /^~?stage@([\w-]+)(?::([\w-]+))?$/,
|
|
60
62
|
// External Stage trigger like ~sd@26:stage@alpha:setup
|
|
@@ -124,5 +126,7 @@ module.exports = {
|
|
|
124
126
|
// Provider Role. Can be arn:aws:iam::xxxxxx:role/some-role
|
|
125
127
|
ROLE_ARN: /^arn:aws:iam::\d{12}:role\/.+/,
|
|
126
128
|
// Stage setup pattern. Can be stage@stage-name:setup
|
|
127
|
-
STAGE_SETUP_PATTERN: /^stage@([\w-]+):setup
|
|
129
|
+
STAGE_SETUP_PATTERN: /^(?:PR-\d+:)?stage@([\w-]+):setup$/,
|
|
130
|
+
// Stage teardown pattern. Can be stage@stage-name:teardown
|
|
131
|
+
STAGE_TEARDOWN_PATTERN: /^(?:PR-\d+:)?stage@([\w-]+):teardown$/
|
|
128
132
|
};
|