Commit e16ea25d authored by Takuya Noguchi's avatar Takuya Noguchi 💖

Replace ruby:2.0/2.1 in examples and test cases with ruby:2.6

Obviously strings in test cases are arbitrary but these changes would
help documentation maintainers keep docs up to date.
Signed-off-by: Takuya Noguchi's avatarTakuya Noguchi <[email protected]>
parent e9cd51ab
......@@ -24,7 +24,7 @@ import (
func setupDockerRegisterCommand(dockerConfig *common.DockerConfig) *RegisterCommand {
fs := flag.NewFlagSet("", flag.ExitOnError)
ctx := cli.NewContext(cli.NewApp(), fs, nil)
fs.String("docker-image", "ruby:2.1", "")
fs.String("docker-image", "ruby:2.6", "")
s := &RegisterCommand{
context: ctx,
......
concurrent = 4
[[runners]]
name = "ruby-2.1"
name = "shell"
url = "https://CI/"
token = "TOKEN"
limit = 2
......@@ -10,7 +10,7 @@ concurrent = 4
shell = "bash"
[[runners]]
name = "ruby-2.1-docker"
name = "ruby-2.6-docker"
url = "https://CI/"
token = "TOKEN"
limit = 0
......@@ -18,13 +18,13 @@ concurrent = 4
builds_dir = ""
[runners.docker]
host = ""
image = "ruby:2.1"
image = "ruby:2.6"
privileged = false
disable_cache = false
cache_dir = ""
[[runners]]
name = "ruby-2.1-docker-ssh"
name = "ubuntu-docker-ssh"
url = "https://CI/"
token = "TOKEN"
limit = 0
......
......@@ -93,36 +93,36 @@ type testAllowedImageDescription struct {
var testAllowedImages = []testAllowedImageDescription{
{true, "ruby", []string{"*"}},
{true, "ruby:2.1", []string{"*"}},
{true, "ruby:2.6", []string{"*"}},
{true, "ruby:latest", []string{"*"}},
{true, "library/ruby", []string{"*/*"}},
{true, "library/ruby:2.1", []string{"*/*"}},
{true, "library/ruby:2.1", []string{"*/*:*"}},
{true, "library/ruby:2.6", []string{"*/*"}},
{true, "library/ruby:2.6", []string{"*/*:*"}},
{true, "my.registry.tld/library/ruby", []string{"my.registry.tld/*/*"}},
{true, "my.registry.tld/library/ruby:2.1", []string{"my.registry.tld/*/*:*"}},
{true, "my.registry.tld/library/ruby:2.6", []string{"my.registry.tld/*/*:*"}},
{true, "my.registry.tld/group/subgroup/ruby", []string{"my.registry.tld/*/*/*"}},
{true, "my.registry.tld/group/subgroup/ruby:2.1", []string{"my.registry.tld/*/*/*:*"}},
{true, "my.registry.tld/group/subgroup/ruby:2.6", []string{"my.registry.tld/*/*/*:*"}},
{true, "ruby", []string{"**/*"}},
{true, "ruby:2.1", []string{"**/*"}},
{true, "ruby:2.6", []string{"**/*"}},
{true, "ruby:latest", []string{"**/*"}},
{true, "library/ruby", []string{"**/*"}},
{true, "library/ruby:2.1", []string{"**/*"}},
{true, "library/ruby:2.1", []string{"**/*:*"}},
{true, "library/ruby:2.6", []string{"**/*"}},
{true, "library/ruby:2.6", []string{"**/*:*"}},
{true, "my.registry.tld/library/ruby", []string{"my.registry.tld/**/*"}},
{true, "my.registry.tld/library/ruby:2.1", []string{"my.registry.tld/**/*:*"}},
{true, "my.registry.tld/library/ruby:2.6", []string{"my.registry.tld/**/*:*"}},
{true, "my.registry.tld/group/subgroup/ruby", []string{"my.registry.tld/**/*"}},
{true, "my.registry.tld/group/subgroup/ruby:2.1", []string{"my.registry.tld/**/*:*"}},
{true, "my.registry.tld/group/subgroup/ruby:2.6", []string{"my.registry.tld/**/*:*"}},
{false, "library/ruby", []string{"*"}},
{false, "library/ruby:2.1", []string{"*"}},
{false, "library/ruby:2.6", []string{"*"}},
{false, "my.registry.tld/ruby", []string{"*"}},
{false, "my.registry.tld/ruby:2.1", []string{"*"}},
{false, "my.registry.tld/ruby:2.6", []string{"*"}},
{false, "my.registry.tld/library/ruby", []string{"*"}},
{false, "my.registry.tld/library/ruby:2.1", []string{"*"}},
{false, "my.registry.tld/library/ruby:2.6", []string{"*"}},
{false, "my.registry.tld/group/subgroup/ruby", []string{"*"}},
{false, "my.registry.tld/group/subgroup/ruby:2.1", []string{"*"}},
{false, "my.registry.tld/group/subgroup/ruby:2.6", []string{"*"}},
{false, "library/ruby", []string{"*/*:*"}},
{false, "my.registry.tld/group/subgroup/ruby", []string{"my.registry.tld/*/*"}},
{false, "my.registry.tld/group/subgroup/ruby:2.1", []string{"my.registry.tld/*/*:*"}},
{false, "my.registry.tld/group/subgroup/ruby:2.6", []string{"my.registry.tld/*/*:*"}},
{false, "library/ruby", []string{"**/*:*"}},
}
......
......@@ -342,7 +342,7 @@ func getRequestJobResponse() (res map[string]interface{}) {
res["steps"] = steps
image := make(map[string]interface{})
image["name"] = "ruby:2.0"
image["name"] = "ruby:2.6"
image["entrypoint"] = []string{"/bin/sh"}
res["image"] = image
......@@ -480,7 +480,7 @@ func TestRequestJob(t *testing.T) {
}
assert.True(t, ok)
assert.Equal(t, "ruby:2.0", res.Image.Name)
assert.Equal(t, "ruby:2.6", res.Image.Name)
assert.Equal(t, []string{"/bin/sh"}, res.Image.Entrypoint)
require.Len(t, res.Services, 2)
assert.Equal(t, "postgresql:9.5", res.Services[0].Name)
......
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