Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cc91cf3e
Commit
cc91cf3e
authored
Oct 21, 2021
by
mc_rocha
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move DAST CI Job keys to the EE Variant
Changelog: fixed MR: EE: true
parent
39074c9b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
2 deletions
+17
-2
ee/lib/ee/gitlab/ci/config/entry/job.rb
ee/lib/ee/gitlab/ci/config/entry/job.rb
+11
-0
lib/gitlab/ci/config/entry/job.rb
lib/gitlab/ci/config/entry/job.rb
+6
-2
No files found.
ee/lib/ee/gitlab/ci/config/entry/job.rb
View file @
cc91cf3e
...
@@ -22,10 +22,21 @@ module EE
...
@@ -22,10 +22,21 @@ module EE
metadata:
{
composable_class:
::
Gitlab
::
Ci
::
Config
::
Entry
::
Secret
}
metadata:
{
composable_class:
::
Gitlab
::
Ci
::
Config
::
Entry
::
Secret
}
end
end
EE_ALLOWED_KEYS
=
%i[dast_configuration secrets]
.
freeze
override
:value
override
:value
def
value
def
value
super
.
merge
({
dast_configuration:
dast_configuration_value
,
secrets:
secrets_value
}.
compact
)
super
.
merge
({
dast_configuration:
dast_configuration_value
,
secrets:
secrets_value
}.
compact
)
end
end
class_methods
do
extend
::
Gitlab
::
Utils
::
Override
override
:allowed_keys
def
allowed_keys
super
+
EE_ALLOWED_KEYS
end
end
end
end
end
end
end
end
...
...
lib/gitlab/ci/config/entry/job.rb
View file @
cc91cf3e
...
@@ -14,10 +14,10 @@ module Gitlab
...
@@ -14,10 +14,10 @@ module Gitlab
ALLOWED_KEYS
=
%i[tags script type image services start_in artifacts
ALLOWED_KEYS
=
%i[tags script type image services start_in artifacts
cache dependencies before_script after_script
cache dependencies before_script after_script
environment coverage retry parallel interruptible timeout
environment coverage retry parallel interruptible timeout
release
dast_configuration secrets
]
.
freeze
release]
.
freeze
validations
do
validations
do
validates
:config
,
allowed_keys:
ALLOWED_KEYS
+
PROCESSABLE_ALLOWED_KEYS
validates
:config
,
allowed_keys:
Gitlab
::
Ci
::
Config
::
Entry
::
Job
.
allowed_keys
+
PROCESSABLE_ALLOWED_KEYS
validates
:script
,
presence:
true
validates
:script
,
presence:
true
with_options
allow_nil:
true
do
with_options
allow_nil:
true
do
...
@@ -178,6 +178,10 @@ module Gitlab
...
@@ -178,6 +178,10 @@ module Gitlab
allow_failure_defined?
?
static_allow_failure
:
manual_action?
allow_failure_defined?
?
static_allow_failure
:
manual_action?
end
end
def
self
.
allowed_keys
ALLOWED_KEYS
end
private
private
def
allow_failure_criteria
def
allow_failure_criteria
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment