BigW Consortium Gitlab

Commit 0fe0b044 by Lin Jen-Shin

No need to set cache:key if no path was specified

parent cce1792c
...@@ -25,10 +25,6 @@ module Gitlab ...@@ -25,10 +25,6 @@ module Gitlab
helpers :key helpers :key
def self.default
{ key: Entry::Key.default }
end
def value def value
super.merge(key: key_value) super.merge(key: key_value)
end end
......
...@@ -51,7 +51,7 @@ module Ci ...@@ -51,7 +51,7 @@ module Ci
commands: "pwd\nrspec", commands: "pwd\nrspec",
coverage_regex: nil, coverage_regex: nil,
tag_list: [], tag_list: [],
options: { cache: { key: 'default' } }, options: {},
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
environment: nil, environment: nil,
...@@ -468,8 +468,7 @@ module Ci ...@@ -468,8 +468,7 @@ module Ci
tag_list: [], tag_list: [],
options: { options: {
image: "ruby:2.1", image: "ruby:2.1",
services: ["mysql"], services: ["mysql"]
cache: { key: 'default' }
}, },
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
...@@ -498,8 +497,7 @@ module Ci ...@@ -498,8 +497,7 @@ module Ci
tag_list: [], tag_list: [],
options: { options: {
image: "ruby:2.5", image: "ruby:2.5",
services: ["postgresql"], services: ["postgresql"]
cache: { key: 'default' }
}, },
allow_failure: false, allow_failure: false,
when: "on_success", when: "on_success",
...@@ -740,7 +738,6 @@ module Ci ...@@ -740,7 +738,6 @@ module Ci
options: { options: {
image: "ruby:2.1", image: "ruby:2.1",
services: ["mysql"], services: ["mysql"],
cache: { key: 'default' },
artifacts: { artifacts: {
name: "custom_name", name: "custom_name",
paths: ["logs/", "binaries/"], paths: ["logs/", "binaries/"],
...@@ -950,7 +947,7 @@ module Ci ...@@ -950,7 +947,7 @@ module Ci
commands: "test", commands: "test",
coverage_regex: nil, coverage_regex: nil,
tag_list: [], tag_list: [],
options: { cache: { key: 'default' } }, options: {},
when: "on_success", when: "on_success",
allow_failure: false, allow_failure: false,
environment: nil, environment: nil,
...@@ -996,7 +993,7 @@ module Ci ...@@ -996,7 +993,7 @@ module Ci
commands: "execute-script-for-job", commands: "execute-script-for-job",
coverage_regex: nil, coverage_regex: nil,
tag_list: [], tag_list: [],
options: { cache: { key: 'default' } }, options: {},
when: "on_success", when: "on_success",
allow_failure: false, allow_failure: false,
environment: nil, environment: nil,
...@@ -1009,7 +1006,7 @@ module Ci ...@@ -1009,7 +1006,7 @@ module Ci
commands: "execute-script-for-job", commands: "execute-script-for-job",
coverage_regex: nil, coverage_regex: nil,
tag_list: [], tag_list: [],
options: { cache: { key: 'default' } }, options: {},
when: "on_success", when: "on_success",
allow_failure: false, allow_failure: false,
environment: nil, environment: nil,
......
...@@ -144,8 +144,7 @@ describe Gitlab::Ci::Config::Entry::Job do ...@@ -144,8 +144,7 @@ describe Gitlab::Ci::Config::Entry::Job do
script: %w[rspec], script: %w[rspec],
commands: "ls\npwd\nrspec", commands: "ls\npwd\nrspec",
stage: 'test', stage: 'test',
after_script: %w[cleanup], after_script: %w[cleanup])
cache: { key: 'default' })
end end
end end
end end
......
...@@ -62,13 +62,11 @@ describe Gitlab::Ci::Config::Entry::Jobs do ...@@ -62,13 +62,11 @@ describe Gitlab::Ci::Config::Entry::Jobs do
rspec: { name: :rspec, rspec: { name: :rspec,
script: %w[rspec], script: %w[rspec],
commands: 'rspec', commands: 'rspec',
stage: 'test', stage: 'test' },
cache: { key: 'default' } },
spinach: { name: :spinach, spinach: { name: :spinach,
script: %w[spinach], script: %w[spinach],
commands: 'spinach', commands: 'spinach',
stage: 'test', stage: 'test' })
cache: { key: 'default' } })
end end
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