Commit 45b627e1 authored by Vitali Tatarintev's avatar Vitali Tatarintev

Merge branch 'spec' into 'master'

Update ruby version in FOSS specs to 3.0

See merge request gitlab-org/gitlab!59230
parents 4def47b3 48aab954
...@@ -875,7 +875,7 @@ module Gitlab ...@@ -875,7 +875,7 @@ module Gitlab
config = YAML.dump({ image: "ruby:2.7", config = YAML.dump({ image: "ruby:2.7",
services: ["mysql"], services: ["mysql"],
before_script: ["pwd"], before_script: ["pwd"],
rspec: { image: { name: "ruby:2.5", entrypoint: ["/usr/local/bin/init", "run"] }, rspec: { image: { name: "ruby:3.0", entrypoint: ["/usr/local/bin/init", "run"] },
services: [{ name: "postgresql", alias: "db-pg", services: [{ name: "postgresql", alias: "db-pg",
entrypoint: ["/usr/local/bin/init", "run"], entrypoint: ["/usr/local/bin/init", "run"],
command: ["/usr/local/bin/init", "run"] }, "docker:dind"], command: ["/usr/local/bin/init", "run"] }, "docker:dind"],
...@@ -892,7 +892,7 @@ module Gitlab ...@@ -892,7 +892,7 @@ module Gitlab
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"], script: ["rspec"],
image: { name: "ruby:2.5", entrypoint: ["/usr/local/bin/init", "run"] }, image: { name: "ruby:3.0", entrypoint: ["/usr/local/bin/init", "run"] },
services: [{ name: "postgresql", alias: "db-pg", entrypoint: ["/usr/local/bin/init", "run"], services: [{ name: "postgresql", alias: "db-pg", entrypoint: ["/usr/local/bin/init", "run"],
command: ["/usr/local/bin/init", "run"] }, command: ["/usr/local/bin/init", "run"] },
{ name: "docker:dind" }] { name: "docker:dind" }]
...@@ -941,7 +941,7 @@ module Gitlab ...@@ -941,7 +941,7 @@ module Gitlab
config = YAML.dump({ image: "ruby:2.7", config = YAML.dump({ image: "ruby:2.7",
services: ["mysql"], services: ["mysql"],
before_script: ["pwd"], before_script: ["pwd"],
rspec: { image: "ruby:2.5", services: ["postgresql", "docker:dind"], script: "rspec" } }) rspec: { image: "ruby:3.0", services: ["postgresql", "docker:dind"], script: "rspec" } })
config_processor = Gitlab::Ci::YamlProcessor.new(config).execute config_processor = Gitlab::Ci::YamlProcessor.new(config).execute
...@@ -954,7 +954,7 @@ module Gitlab ...@@ -954,7 +954,7 @@ module Gitlab
options: { options: {
before_script: ["pwd"], before_script: ["pwd"],
script: ["rspec"], script: ["rspec"],
image: { name: "ruby:2.5" }, image: { name: "ruby:3.0" },
services: [{ name: "postgresql" }, { name: "docker:dind" }] services: [{ name: "postgresql" }, { name: "docker:dind" }]
}, },
allow_failure: false, allow_failure: false,
......
...@@ -132,7 +132,7 @@ RSpec.describe Gitlab::WebIde::Config::Entry::Terminal do ...@@ -132,7 +132,7 @@ RSpec.describe Gitlab::WebIde::Config::Entry::Terminal do
{ before_script: %w[ls pwd], { before_script: %w[ls pwd],
script: 'sleep 100', script: 'sleep 100',
tags: ['webide'], tags: ['webide'],
image: 'ruby:2.5', image: 'ruby:3.0',
services: ['mysql'], services: ['mysql'],
variables: { KEY: 'value' } } variables: { KEY: 'value' } }
end end
...@@ -144,7 +144,7 @@ RSpec.describe Gitlab::WebIde::Config::Entry::Terminal do ...@@ -144,7 +144,7 @@ RSpec.describe Gitlab::WebIde::Config::Entry::Terminal do
yaml_variables: [{ key: 'KEY', value: 'value', public: true }], yaml_variables: [{ key: 'KEY', value: 'value', public: true }],
job_variables: [{ key: 'KEY', value: 'value', public: true }], job_variables: [{ key: 'KEY', value: 'value', public: true }],
options: { options: {
image: { name: "ruby:2.5" }, image: { name: "ruby:3.0" },
services: [{ name: "mysql" }], services: [{ name: "mysql" }],
before_script: %w[ls pwd], before_script: %w[ls pwd],
script: ['sleep 100'] script: ['sleep 100']
......
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