Commit 4967fe94 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Do not assigne unused attributes to CI/CD builds

parent 3a8b9aad
...@@ -55,7 +55,7 @@ module Gitlab ...@@ -55,7 +55,7 @@ module Gitlab
instance: job[:instance], instance: job[:instance],
start_in: job[:start_in], start_in: job[:start_in],
trigger: job[:trigger] trigger: job[:trigger]
}.compact } }.compact }.compact
end end
def stage_builds_attributes(stage) def stage_builds_attributes(stage)
......
...@@ -21,15 +21,12 @@ module Gitlab ...@@ -21,15 +21,12 @@ module Gitlab
stage: "test", stage: "test",
stage_idx: 1, stage_idx: 1,
name: "rspec", name: "rspec",
coverage_regex: nil,
tag_list: [],
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"] script: ["rspec"]
}, },
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
...@@ -154,12 +151,9 @@ module Gitlab ...@@ -154,12 +151,9 @@ module Gitlab
builds: builds:
[{ stage_idx: 1, [{ stage_idx: 1,
stage: "test", stage: "test",
tag_list: [],
name: "rspec", name: "rspec",
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil,
coverage_regex: nil,
yaml_variables: [], yaml_variables: [],
options: { script: ["rspec"] }, options: { script: ["rspec"] },
only: { refs: ["branches"] }, only: { refs: ["branches"] },
...@@ -169,12 +163,9 @@ module Gitlab ...@@ -169,12 +163,9 @@ module Gitlab
builds: builds:
[{ stage_idx: 2, [{ stage_idx: 2,
stage: "deploy", stage: "deploy",
tag_list: [],
name: "prod", name: "prod",
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil,
coverage_regex: nil,
yaml_variables: [], yaml_variables: [],
options: { script: ["cap prod"] }, options: { script: ["cap prod"] },
only: { refs: ["tags"] }, only: { refs: ["tags"] },
...@@ -344,8 +335,6 @@ module Gitlab ...@@ -344,8 +335,6 @@ module Gitlab
stage: "test", stage: "test",
stage_idx: 1, stage_idx: 1,
name: "rspec", name: "rspec",
coverage_regex: nil,
tag_list: [],
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"], script: ["rspec"],
...@@ -356,7 +345,6 @@ module Gitlab ...@@ -356,7 +345,6 @@ module Gitlab
}, },
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
...@@ -378,8 +366,6 @@ module Gitlab ...@@ -378,8 +366,6 @@ module Gitlab
stage: "test", stage: "test",
stage_idx: 1, stage_idx: 1,
name: "rspec", name: "rspec",
coverage_regex: nil,
tag_list: [],
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"], script: ["rspec"],
...@@ -390,7 +376,6 @@ module Gitlab ...@@ -390,7 +376,6 @@ module Gitlab
}, },
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
...@@ -410,8 +395,6 @@ module Gitlab ...@@ -410,8 +395,6 @@ module Gitlab
stage: "test", stage: "test",
stage_idx: 1, stage_idx: 1,
name: "rspec", name: "rspec",
coverage_regex: nil,
tag_list: [],
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"], script: ["rspec"],
...@@ -420,7 +403,6 @@ module Gitlab ...@@ -420,7 +403,6 @@ module Gitlab
}, },
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
...@@ -438,8 +420,6 @@ module Gitlab ...@@ -438,8 +420,6 @@ module Gitlab
stage: "test", stage: "test",
stage_idx: 1, stage_idx: 1,
name: "rspec", name: "rspec",
coverage_regex: nil,
tag_list: [],
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"], script: ["rspec"],
...@@ -448,7 +428,6 @@ module Gitlab ...@@ -448,7 +428,6 @@ module Gitlab
}, },
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
...@@ -763,8 +742,6 @@ module Gitlab ...@@ -763,8 +742,6 @@ module Gitlab
stage: "test", stage: "test",
stage_idx: 1, stage_idx: 1,
name: "rspec", name: "rspec",
coverage_regex: nil,
tag_list: [],
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"], script: ["rspec"],
...@@ -779,7 +756,6 @@ module Gitlab ...@@ -779,7 +756,6 @@ module Gitlab
}, },
when: "on_success", when: "on_success",
allow_failure: false, allow_failure: false,
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
...@@ -976,14 +952,11 @@ module Gitlab ...@@ -976,14 +952,11 @@ module Gitlab
stage: "test", stage: "test",
stage_idx: 1, stage_idx: 1,
name: "normal_job", name: "normal_job",
coverage_regex: nil,
tag_list: [],
options: { options: {
script: ["test"] script: ["test"]
}, },
when: "on_success", when: "on_success",
allow_failure: false, allow_failure: false,
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
...@@ -1023,28 +996,22 @@ module Gitlab ...@@ -1023,28 +996,22 @@ module Gitlab
stage: "build", stage: "build",
stage_idx: 0, stage_idx: 0,
name: "job1", name: "job1",
coverage_regex: nil,
tag_list: [],
options: { options: {
script: ["execute-script-for-job"] script: ["execute-script-for-job"]
}, },
when: "on_success", when: "on_success",
allow_failure: false, allow_failure: false,
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
expect(subject.second).to eq({ expect(subject.second).to eq({
stage: "build", stage: "build",
stage_idx: 0, stage_idx: 0,
name: "job2", name: "job2",
coverage_regex: nil,
tag_list: [],
options: { options: {
script: ["execute-script-for-job"] script: ["execute-script-for-job"]
}, },
when: "on_success", when: "on_success",
allow_failure: false, allow_failure: false,
environment: nil,
yaml_variables: [] yaml_variables: []
}) })
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment