diff --git a/pkg/cli/admin/buildchain/test/multiple-namespaces-bcs.yaml b/pkg/cli/admin/buildchain/test/multiple-namespaces-bcs.yaml index 41d71f10a2..a6f01d670c 100644 --- a/pkg/cli/admin/buildchain/test/multiple-namespaces-bcs.yaml +++ b/pkg/cli/admin/buildchain/test/multiple-namespaces-bcs.yaml @@ -24,7 +24,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest namespace: master type: Docker triggers: @@ -35,7 +35,7 @@ items: secret: 3kYKtANjVRCOPoM0uLNp type: Generic - imageChange: - lastTriggeredImageID: centos/ruby-22-centos7:latest + lastTriggeredImageID: centos/ruby-25-centos7:latest type: ImageChange status: lastVersion: 1 @@ -66,7 +66,7 @@ items: sourceStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest namespace: master type: Source triggers: @@ -77,7 +77,7 @@ items: secret: secret101 type: Generic - imageChange: - lastTriggeredImageID: centos/ruby-22-centos7:latest + lastTriggeredImageID: centos/ruby-25-centos7:latest type: ImageChange status: lastVersion: 1 @@ -104,7 +104,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 incremental: true type: Source triggers: @@ -135,7 +135,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 incremental: true type: Source triggers: diff --git a/pkg/cli/admin/buildchain/test/multiple-trigger-bcs.yaml b/pkg/cli/admin/buildchain/test/multiple-trigger-bcs.yaml index 6d8eb1b419..30668227b2 100644 --- a/pkg/cli/admin/buildchain/test/multiple-trigger-bcs.yaml +++ b/pkg/cli/admin/buildchain/test/multiple-trigger-bcs.yaml @@ -1,5 +1,5 @@ # Sets up a multi-parent build config tree -# centos/ruby-22-centos7:latest +# centos/ruby-25-centos7:latest # -> bc - parent1 (input, trigger) # -> parent1img:latest # -> bc - child1 (input) @@ -39,7 +39,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -69,7 +69,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -99,7 +99,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -160,7 +160,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7:latest + name: centos/ruby-25-centos7:latest type: Source triggers: - github: diff --git a/pkg/cli/admin/buildchain/test/single-namespace-bcs.yaml b/pkg/cli/admin/buildchain/test/single-namespace-bcs.yaml index 187125d298..dd70b10019 100644 --- a/pkg/cli/admin/buildchain/test/single-namespace-bcs.yaml +++ b/pkg/cli/admin/buildchain/test/single-namespace-bcs.yaml @@ -23,7 +23,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -33,7 +33,7 @@ items: secret: 3kYKtANjVRCOPoM0uLNp type: Generic - imageChange: - lastTriggeredImageID: centos/ruby-22-centos7:latest + lastTriggeredImageID: centos/ruby-25-centos7:latest type: ImageChange status: lastVersion: 1 @@ -63,7 +63,7 @@ items: sourceStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Source triggers: - github: @@ -73,7 +73,7 @@ items: secret: secret101 type: Generic - imageChange: - lastTriggeredImageID: centos/ruby-22-centos7:latest + lastTriggeredImageID: centos/ruby-25-centos7:latest type: ImageChange status: lastVersion: 1 @@ -100,7 +100,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 incremental: true type: Source triggers: @@ -131,7 +131,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 incremental: true type: Source triggers: diff --git a/pkg/cli/kubectlwrappers/wrappers.go b/pkg/cli/kubectlwrappers/wrappers.go index 82b75de367..a171afa236 100644 --- a/pkg/cli/kubectlwrappers/wrappers.go +++ b/pkg/cli/kubectlwrappers/wrappers.go @@ -187,8 +187,8 @@ var ( given resource.`) describeExample = templates.Examples(` - # Provide details about the ruby-22-centos7 image repository - %[1]s describe imageRepository ruby-22-centos7 + # Provide details about the ruby-25-centos7 image repository + %[1]s describe imageRepository ruby-25-centos7 # Provide details about the ruby-sample-build build configuration %[1]s describe bc ruby-sample-build`) diff --git a/pkg/helpers/describe/chaindescriber_test.go b/pkg/helpers/describe/chaindescriber_test.go index 924d9cbdc4..5731311f2c 100644 --- a/pkg/helpers/describe/chaindescriber_test.go +++ b/pkg/helpers/describe/chaindescriber_test.go @@ -37,11 +37,11 @@ func TestChainDescriber(t *testing.T) { namespaces: sets.NewString("example"), output: "", defaultNamespace: "example", - name: "ruby-22-centos7", + name: "ruby-25-centos7", tag: "latest", path: "../graph/genericgraph/test/circular.yaml", humanReadable: map[string]int{ - "Cycle detected in build configurations: bc/ruby-22-centos7 -> istag/ruby-hello-world:latest -> bc/ruby-hello-world -> istag/ruby-something-else:latest -> bc/ruby-something-else -> istag/ruby-22-centos7:latest -> bc/ruby-22-centos7": 1, + "Cycle detected in build configurations: bc/ruby-25-centos7 -> istag/ruby-hello-world:latest -> bc/ruby-hello-world -> istag/ruby-something-else:latest -> bc/ruby-something-else -> istag/ruby-25-centos7:latest -> bc/ruby-25-centos7": 1, }, expectedErr: nil, }, @@ -50,11 +50,11 @@ func TestChainDescriber(t *testing.T) { namespaces: sets.NewString("test"), output: "", defaultNamespace: "test", - name: "ruby-22-centos7", + name: "ruby-25-centos7", tag: "latest", path: "../../../pkg/cli/admin/buildchain/test/single-namespace-bcs.yaml", humanReadable: map[string]int{ - "istag/ruby-22-centos7:latest": 1, + "istag/ruby-25-centos7:latest": 1, "\tbc/ruby-hello-world": 1, "\t\tistag/ruby-hello-world:latest": 1, "\tbc/ruby-sample-build": 1, @@ -67,16 +67,16 @@ func TestChainDescriber(t *testing.T) { namespaces: sets.NewString("test"), output: "dot", defaultNamespace: "test", - name: "ruby-22-centos7", + name: "ruby-25-centos7", tag: "latest", path: "../../../pkg/cli/admin/buildchain/test/single-namespace-bcs.yaml", dot: []string{ - "digraph \"ruby-22-centos7:latest\" {", + "digraph \"ruby-25-centos7:latest\" {", "// Node definitions.", "[label=\"BuildConfig|test/ruby-hello-world\"];", "[label=\"BuildConfig|test/ruby-sample-build\"];", "[label=\"ImageStreamTag|test/ruby-hello-world:latest\"];", - "[label=\"ImageStreamTag|test/ruby-22-centos7:latest\"];", + "[label=\"ImageStreamTag|test/ruby-25-centos7:latest\"];", "[label=\"ImageStreamTag|test/origin-ruby-sample:latest\"];", "", "// Edge definitions.", @@ -93,11 +93,11 @@ func TestChainDescriber(t *testing.T) { namespaces: sets.NewString("test", "master", "default"), output: "", defaultNamespace: "master", - name: "ruby-22-centos7", + name: "ruby-25-centos7", tag: "latest", path: "../../../pkg/cli/admin/buildchain/test/multiple-namespaces-bcs.yaml", humanReadable: map[string]int{ - "": 1, + "": 1, "\t": 1, "\t\t": 1, "\t": 1, @@ -110,16 +110,16 @@ func TestChainDescriber(t *testing.T) { namespaces: sets.NewString("test", "master", "default"), output: "dot", defaultNamespace: "master", - name: "ruby-22-centos7", + name: "ruby-25-centos7", tag: "latest", path: "../../../pkg/cli/admin/buildchain/test/multiple-namespaces-bcs.yaml", dot: []string{ - "digraph \"ruby-22-centos7:latest\" {", + "digraph \"ruby-25-centos7:latest\" {", "// Node definitions.", "[label=\"BuildConfig|default/ruby-hello-world\"];", "[label=\"BuildConfig|test/ruby-sample-build\"];", "[label=\"ImageStreamTag|test/ruby-hello-world:latest\"];", - "[label=\"ImageStreamTag|master/ruby-22-centos7:latest\"];", + "[label=\"ImageStreamTag|master/ruby-25-centos7:latest\"];", "[label=\"ImageStreamTag|another/origin-ruby-sample:latest\"];", "", "// Edge definitions.", @@ -133,13 +133,13 @@ func TestChainDescriber(t *testing.T) { }, { testName: "human readable - multiple triggers - triggeronly", - name: "ruby-22-centos7", + name: "ruby-25-centos7", defaultNamespace: "test", tag: "latest", path: "../../../pkg/cli/admin/buildchain/test/multiple-trigger-bcs.yaml", namespaces: sets.NewString("test"), humanReadable: map[string]int{ - "istag/ruby-22-centos7:latest": 1, + "istag/ruby-25-centos7:latest": 1, "\tbc/parent1": 1, "\t\tistag/parent1img:latest": 1, "\t\t\tbc/child2": 2, @@ -156,14 +156,14 @@ func TestChainDescriber(t *testing.T) { }, { testName: "human readable - multiple triggers - trigger+input", - name: "ruby-22-centos7", + name: "ruby-25-centos7", defaultNamespace: "test", tag: "latest", path: "../../../pkg/cli/admin/buildchain/test/multiple-trigger-bcs.yaml", namespaces: sets.NewString("test"), includeInputImg: true, humanReadable: map[string]int{ - "istag/ruby-22-centos7:latest": 1, + "istag/ruby-25-centos7:latest": 1, "\tbc/parent1": 1, "\t\tistag/parent1img:latest": 1, "\t\t\tbc/child1": 2, @@ -191,7 +191,7 @@ func TestChainDescriber(t *testing.T) { "\tbc/child2": 1, "\t\tistag/parent1img:latest": 1, "\t\t\tbc/parent1": 1, - "\t\t\t\tistag/ruby-22-centos7:latest": 2, + "\t\t\t\tistag/ruby-25-centos7:latest": 2, "\t\tistag/parent3img:latest": 1, "\t\t\tbc/parent3": 1, }, diff --git a/pkg/helpers/describe/projectstatus_test.go b/pkg/helpers/describe/projectstatus_test.go index 77c4e640dc..9502e3e04e 100644 --- a/pkg/helpers/describe/projectstatus_test.go +++ b/pkg/helpers/describe/projectstatus_test.go @@ -216,7 +216,7 @@ func TestProjectStatus(t *testing.T) { "svc/sinatra-example-2 - 172.30.17.48:8080", "deploys istag/sinatra-example-2:latest <-", "builds git://github.com", - "on docker.io/centos/ruby-22-centos7:latest", + "on docker.io/centos/ruby-25-centos7:latest", "not built yet", "deployment #1 waiting on image or update", "View details with 'oc describe /' or list everything with 'oc get all'.", @@ -260,7 +260,7 @@ func TestProjectStatus(t *testing.T) { ErrFn: func(err error) bool { return err == nil }, Contains: []string{ "Cycle detected in build configurations:", - "on istag/ruby-22-centos7:latest", + "on istag/ruby-25-centos7:latest", "-> istag/ruby-hello-world:latest", }, }, @@ -276,7 +276,7 @@ func TestProjectStatus(t *testing.T) { "In project example on server https://example.com:8443\n", "svc/sinatra-example-1 - 172.30.17.47:8080", "builds git://github.com", - "on docker.io/centos/ruby-22-centos7:latest", + "on docker.io/centos/ruby-25-centos7:latest", "build #1 running for about a minute", "deployment #1 waiting on image or update", "View details with 'oc describe /' or list everything with 'oc get all'.", @@ -296,7 +296,7 @@ func TestProjectStatus(t *testing.T) { "svc/sinatra-app-example - 172.30.17.49:8080", "sinatra-app-example-a deploys", "sinatra-app-example-b deploys", - "on docker.io/centos/ruby-22-centos7:latest", + "on docker.io/centos/ruby-25-centos7:latest", "build #1 running for about a minute", "- 7a4f354: Prepare v1 Template types (Roy Programmer )", "View details with 'oc describe /' or list everything with 'oc get all'.", @@ -320,7 +320,7 @@ func TestProjectStatus(t *testing.T) { "database test deploys", "frontend deploys", "istag/origin-ruby-sample:latest <-", - "on docker.io/centos/ruby-22-centos7:latest", + "on docker.io/centos/ruby-25-centos7:latest", "deployment #3 pending on image", "deployment #2 failed less than a second ago: unable to contact server - 0/1 pods", "deployment #1 deployed less than a second ago", @@ -346,7 +346,7 @@ func TestProjectStatus(t *testing.T) { "In project example on server https://example.com:8443\n", "svc/ruby-deploy", "deployment/ruby-deploy deploys istag/ruby-deploy:latest <-", - "bc/ruby-deploy source builds https://github.com/sclorg/ruby-ex.git on istag/ruby-22-centos7:latest", + "bc/ruby-deploy source builds https://github.com/sclorg/ruby-ex.git on istag/ruby-25-centos7:latest", "not built yet", }, Time: mustParseTime("2015-04-07T04:12:25Z"), diff --git a/pkg/helpers/graph/genericgraph/test/bare-bc.yaml b/pkg/helpers/graph/genericgraph/test/bare-bc.yaml index f6935d9249..8cd2ca7c29 100644 --- a/pkg/helpers/graph/genericgraph/test/bare-bc.yaml +++ b/pkg/helpers/graph/genericgraph/test/bare-bc.yaml @@ -4,9 +4,9 @@ items: kind: ImageStream metadata: creationTimestamp: null - name: ruby-22-centos7 + name: ruby-25-centos7 spec: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 status: dockerImageRepository: "" - apiVersion: v1 @@ -36,7 +36,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: diff --git a/pkg/helpers/graph/genericgraph/test/bare-dc.yaml b/pkg/helpers/graph/genericgraph/test/bare-dc.yaml index 20b2b48a31..db800ed83f 100644 --- a/pkg/helpers/graph/genericgraph/test/bare-dc.yaml +++ b/pkg/helpers/graph/genericgraph/test/bare-dc.yaml @@ -4,9 +4,9 @@ items: kind: ImageStream metadata: creationTimestamp: null - name: ruby-22-centos7 + name: ruby-25-centos7 spec: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 status: dockerImageRepository: "" - apiVersion: v1 @@ -36,7 +36,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: diff --git a/pkg/helpers/graph/genericgraph/test/circular-not.yaml b/pkg/helpers/graph/genericgraph/test/circular-not.yaml index b6f993900a..e3fe6b045e 100644 --- a/pkg/helpers/graph/genericgraph/test/circular-not.yaml +++ b/pkg/helpers/graph/genericgraph/test/circular-not.yaml @@ -4,7 +4,7 @@ items: kind: BuildConfig metadata: creationTimestamp: null - name: ruby-22-centos7 + name: ruby-25-centos7 spec: output: to: @@ -19,7 +19,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: diff --git a/pkg/helpers/graph/genericgraph/test/circular.yaml b/pkg/helpers/graph/genericgraph/test/circular.yaml index 8b2c919bb4..bd36b75e1d 100644 --- a/pkg/helpers/graph/genericgraph/test/circular.yaml +++ b/pkg/helpers/graph/genericgraph/test/circular.yaml @@ -4,7 +4,7 @@ items: kind: BuildConfig metadata: creationTimestamp: null - name: ruby-22-centos7 + name: ruby-25-centos7 namespace: example spec: output: @@ -20,7 +20,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -76,7 +76,7 @@ items: output: to: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest resources: {} source: git: diff --git a/pkg/helpers/graph/genericgraph/test/deployment.yaml b/pkg/helpers/graph/genericgraph/test/deployment.yaml index 7adbf440e4..5f20d34d3b 100644 --- a/pkg/helpers/graph/genericgraph/test/deployment.yaml +++ b/pkg/helpers/graph/genericgraph/test/deployment.yaml @@ -108,7 +108,7 @@ items: sourceStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Source successfulBuildsHistoryLimit: 5 triggers: diff --git a/pkg/helpers/graph/genericgraph/test/failed-build.yaml b/pkg/helpers/graph/genericgraph/test/failed-build.yaml index dd2bf482d3..7639bcb530 100644 --- a/pkg/helpers/graph/genericgraph/test/failed-build.yaml +++ b/pkg/helpers/graph/genericgraph/test/failed-build.yaml @@ -21,7 +21,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -57,7 +57,7 @@ items: dockerStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7:latest + name: centos/ruby-25-centos7:latest type: Docker status: config: @@ -71,11 +71,11 @@ items: creationTimestamp: null labels: app: ruby - name: ruby-22-centos7 + name: ruby-25-centos7 spec: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 status: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 - apiVersion: v1 kind: ImageStream metadata: diff --git a/pkg/helpers/graph/genericgraph/test/missing-istag.yaml b/pkg/helpers/graph/genericgraph/test/missing-istag.yaml index 4280bdd766..a82b99b203 100644 --- a/pkg/helpers/graph/genericgraph/test/missing-istag.yaml +++ b/pkg/helpers/graph/genericgraph/test/missing-istag.yaml @@ -21,7 +21,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -53,7 +53,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: diff --git a/pkg/helpers/graph/genericgraph/test/new-app.yaml b/pkg/helpers/graph/genericgraph/test/new-app.yaml index 6dbf2fb8d3..d7b0f973e1 100644 --- a/pkg/helpers/graph/genericgraph/test/new-app.yaml +++ b/pkg/helpers/graph/genericgraph/test/new-app.yaml @@ -3,9 +3,9 @@ items: - apiVersion: v1 kind: ImageStream metadata: - name: ruby-22-centos7 + name: ruby-25-centos7 spec: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 - apiVersion: v1 kind: ImageStream metadata: @@ -32,7 +32,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -61,7 +61,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -90,7 +90,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: diff --git a/pkg/helpers/graph/genericgraph/test/new-project-deployed-app.yaml b/pkg/helpers/graph/genericgraph/test/new-project-deployed-app.yaml index 666eda3f28..faecada459 100644 --- a/pkg/helpers/graph/genericgraph/test/new-project-deployed-app.yaml +++ b/pkg/helpers/graph/genericgraph/test/new-project-deployed-app.yaml @@ -23,7 +23,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 incremental: true type: Source triggers: @@ -34,7 +34,7 @@ items: secret: secret101 type: generic - imageChange: - lastTriggeredImageID: centos/ruby-22-centos7:latest + lastTriggeredImageID: centos/ruby-25-centos7:latest type: imageChange status: lastVersion: 1 @@ -62,7 +62,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7:latest + name: centos/ruby-25-centos7:latest incremental: true type: Source status: diff --git a/pkg/helpers/graph/genericgraph/test/new-project-no-build.yaml b/pkg/helpers/graph/genericgraph/test/new-project-no-build.yaml index 8cc191cbbc..529d85084d 100644 --- a/pkg/helpers/graph/genericgraph/test/new-project-no-build.yaml +++ b/pkg/helpers/graph/genericgraph/test/new-project-no-build.yaml @@ -19,7 +19,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 type: Source triggers: - github: diff --git a/pkg/helpers/graph/genericgraph/test/new-project-one-build.yaml b/pkg/helpers/graph/genericgraph/test/new-project-one-build.yaml index 7f11b72c92..8eb24622ce 100644 --- a/pkg/helpers/graph/genericgraph/test/new-project-one-build.yaml +++ b/pkg/helpers/graph/genericgraph/test/new-project-one-build.yaml @@ -20,7 +20,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 type: Source triggers: - github: @@ -62,7 +62,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 type: Source status: phase: Running diff --git a/pkg/helpers/graph/genericgraph/test/new-project-two-deployment-configs.yaml b/pkg/helpers/graph/genericgraph/test/new-project-two-deployment-configs.yaml index c2a90d7326..2efacb6c8d 100644 --- a/pkg/helpers/graph/genericgraph/test/new-project-two-deployment-configs.yaml +++ b/pkg/helpers/graph/genericgraph/test/new-project-two-deployment-configs.yaml @@ -19,7 +19,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 type: Source triggers: - github: @@ -68,7 +68,7 @@ items: sourceStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7 + name: centos/ruby-25-centos7 type: Source status: phase: Running diff --git a/pkg/helpers/graph/genericgraph/test/pushable-build.yaml b/pkg/helpers/graph/genericgraph/test/pushable-build.yaml index 09f664e9c5..bc80aa4770 100644 --- a/pkg/helpers/graph/genericgraph/test/pushable-build.yaml +++ b/pkg/helpers/graph/genericgraph/test/pushable-build.yaml @@ -21,7 +21,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -57,7 +57,7 @@ items: dockerStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7:latest + name: centos/ruby-25-centos7:latest type: Docker status: config: @@ -71,11 +71,11 @@ items: creationTimestamp: null labels: app: ruby - name: ruby-22-centos7 + name: ruby-25-centos7 spec: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 status: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 - apiVersion: v1 kind: ImageStream metadata: diff --git a/pkg/helpers/graph/genericgraph/test/unpushable-build-2.yaml b/pkg/helpers/graph/genericgraph/test/unpushable-build-2.yaml index a28a14ecc1..58fc2777bb 100644 --- a/pkg/helpers/graph/genericgraph/test/unpushable-build-2.yaml +++ b/pkg/helpers/graph/genericgraph/test/unpushable-build-2.yaml @@ -21,7 +21,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -57,7 +57,7 @@ items: dockerStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7:latest + name: centos/ruby-25-centos7:latest type: Docker status: config: @@ -71,11 +71,11 @@ items: creationTimestamp: null labels: app: ruby - name: ruby-22-centos7 + name: ruby-25-centos7 spec: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 status: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 - apiVersion: v1 kind: DeploymentConfig metadata: diff --git a/pkg/helpers/graph/genericgraph/test/unpushable-build.yaml b/pkg/helpers/graph/genericgraph/test/unpushable-build.yaml index b80ff3e751..f3da0ed6b5 100644 --- a/pkg/helpers/graph/genericgraph/test/unpushable-build.yaml +++ b/pkg/helpers/graph/genericgraph/test/unpushable-build.yaml @@ -22,7 +22,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -57,7 +57,7 @@ items: dockerStrategy: from: kind: ImageStreamTag - name: ruby-22-centos7:latest + name: ruby-25-centos7:latest type: Docker triggers: - github: @@ -94,7 +94,7 @@ items: dockerStrategy: from: kind: DockerImage - name: centos/ruby-22-centos7:latest + name: centos/ruby-25-centos7:latest type: Docker status: config: @@ -108,12 +108,12 @@ items: creationTimestamp: null labels: app: ruby - name: ruby-22-centos7 + name: ruby-25-centos7 namespace: example spec: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 status: - dockerImageRepository: centos/ruby-22-centos7 + dockerImageRepository: centos/ruby-25-centos7 - apiVersion: image.openshift.io/v1 kind: ImageStream metadata: diff --git a/pkg/helpers/newapp/app/imageref_test.go b/pkg/helpers/newapp/app/imageref_test.go index cf46235048..2de3192586 100644 --- a/pkg/helpers/newapp/app/imageref_test.go +++ b/pkg/helpers/newapp/app/imageref_test.go @@ -353,7 +353,7 @@ func TestFromDockerfile(t *testing.T) { } } -const dockerFile = `FROM centos/ruby-22-centos7 +const dockerFile = `FROM centos/ruby-25-centos7 USER default EXPOSE 443 ENV RACK_ENV production diff --git a/pkg/helpers/newapp/newapptest/newapp_test.go b/pkg/helpers/newapp/newapptest/newapp_test.go index 9e1ef4cf55..42c10ff68c 100644 --- a/pkg/helpers/newapp/newapptest/newapp_test.go +++ b/pkg/helpers/newapp/newapptest/newapp_test.go @@ -472,7 +472,7 @@ func TestNewAppRunAll(t *testing.T) { }, checkPort: "8080", expected: map[string][]string{ - "imageStream": {"ruby-hello-world", "ruby-22-centos7"}, + "imageStream": {"ruby-hello-world", "ruby-25-centos7"}, "buildConfig": {"ruby-hello-world"}, "deploymentConfig": {"ruby-hello-world"}, "service": {"ruby-hello-world"}, @@ -670,7 +670,7 @@ func TestNewAppRunAll(t *testing.T) { Resolvers: cmd.Resolvers{ DockerSearcher: app.DockerClientSearcher{ Client: &apptest.FakeDockerClient{ - Images: []docker.APIImages{{RepoTags: []string{"centos/ruby-22-centos7"}}}, + Images: []docker.APIImages{{RepoTags: []string{"centos/ruby-25-centos7"}}}, Image: dockerBuilderImage(), }, Insecure: true, @@ -698,7 +698,7 @@ func TestNewAppRunAll(t *testing.T) { OriginNamespace: "default", }, expected: map[string][]string{ - "imageStream": {"ruby-hello-world", "ruby-22-centos7"}, + "imageStream": {"ruby-hello-world", "ruby-25-centos7"}, "buildConfig": {"ruby-hello-world"}, "deploymentConfig": {"ruby-hello-world"}, "service": {"ruby-hello-world"}, @@ -716,7 +716,7 @@ func TestNewAppRunAll(t *testing.T) { Resolvers: cmd.Resolvers{ DockerSearcher: app.DockerClientSearcher{ Client: &apptest.FakeDockerClient{ - Images: []docker.APIImages{{RepoTags: []string{"centos/ruby-22-centos7"}}}, + Images: []docker.APIImages{{RepoTags: []string{"centos/ruby-25-centos7"}}}, Image: dockerBuilderImage(), }, Insecure: true, @@ -1009,7 +1009,7 @@ func TestNewAppRunBuilds(t *testing.T) { config: &cmd.AppConfig{ ComponentInputs: cmd.ComponentInputs{ SourceRepositories: []string{"https://github.com/openshift/ruby-hello-world"}, - DockerImages: []string{"centos/ruby-22-centos7", "openshift/nodejs-010-centos7"}, + DockerImages: []string{"centos/ruby-25-centos7", "openshift/nodejs-010-centos7"}, }, GenerationInputs: cmd.GenerationInputs{ OutputDocker: true, @@ -1019,7 +1019,7 @@ func TestNewAppRunBuilds(t *testing.T) { // TODO: this test used to silently ignore components that were not builders (i.e. user input) // That's bad, so the code should either error in this case or be a bit smarter. "buildConfig": {"ruby-hello-world", "ruby-hello-world-1"}, - "imageStream": {"nodejs-010-centos7", "ruby-22-centos7"}, + "imageStream": {"nodejs-010-centos7", "ruby-25-centos7"}, }, }, { @@ -1115,12 +1115,12 @@ func TestNewAppRunBuilds(t *testing.T) { SourceRepositories: []string{"https://github.com/openshift/ruby-hello-world"}, }, GenerationInputs: cmd.GenerationInputs{ - Dockerfile: "FROM centos/ruby-22-centos7\nRUN false", + Dockerfile: "FROM centos/ruby-25-centos7\nRUN false", }, }, expected: map[string][]string{ "buildConfig": {"ruby-hello-world"}, - "imageStream": {"ruby-22-centos7", "ruby-hello-world"}, + "imageStream": {"ruby-25-centos7", "ruby-hello-world"}, }, checkResult: func(res *cmd.AppResult) error { var bc *buildv1.BuildConfig @@ -1140,7 +1140,7 @@ func TestNewAppRunBuilds(t *testing.T) { if bc.Spec.Source.Dockerfile != nil { got = *bc.Spec.Source.Dockerfile } - want := "FROM centos/ruby-22-centos7\nRUN false" + want := "FROM centos/ruby-25-centos7\nRUN false" if got != want { return fmt.Errorf("bc.Spec.Source.Dockerfile = %q; want %q", got, want) } @@ -1181,7 +1181,7 @@ func TestNewAppRunBuilds(t *testing.T) { }, }, GenerationInputs: cmd.GenerationInputs{ - Dockerfile: "FROM centos/ruby-22-centos7\nRUN false", + Dockerfile: "FROM centos/ruby-25-centos7\nRUN false", }, }, expectedErr: func(err error) bool { @@ -1203,7 +1203,7 @@ func TestNewAppRunBuilds(t *testing.T) { }, expected: map[string][]string{ "buildConfig": {"ruby-hello-world"}, - "imageStream": {"mongodb-26-centos7", "ruby-22-centos7", "ruby-hello-world"}, + "imageStream": {"mongodb-26-centos7", "ruby-25-centos7", "ruby-hello-world"}, }, checkResult: func(res *cmd.AppResult) error { var bc *buildv1.BuildConfig @@ -1516,20 +1516,20 @@ func TestNewAppBuildOutputCycleDetection(t *testing.T) { config: &cmd.AppConfig{ GenerationInputs: cmd.GenerationInputs{ OutputDocker: true, - To: "centos/ruby-22-centos7", - Dockerfile: "FROM centos/ruby-22-centos7:latest", + To: "centos/ruby-25-centos7", + Dockerfile: "FROM centos/ruby-25-centos7:latest", }, }, expected: map[string][]string{ - "buildConfig": {"ruby-22-centos7"}, - "imageStream": {"ruby-22-centos7"}, + "buildConfig": {"ruby-25-centos7"}, + "imageStream": {"ruby-25-centos7"}, }, checkOutput: func(stdout, stderr io.Reader) error { got, err := ioutil.ReadAll(stderr) if err != nil { return err } - want := "--> WARNING: output image of \"centos/ruby-22-centos7:latest\" should be different than input\n" + want := "--> WARNING: output image of \"centos/ruby-25-centos7:latest\" should be different than input\n" if string(got) != want { return fmt.Errorf("stderr: got %q; want %q", got, want) } @@ -1564,20 +1564,20 @@ func TestNewAppBuildOutputCycleDetection(t *testing.T) { name: "successful build from dockerfile with identical input and output image references with warning(2)", config: &cmd.AppConfig{ GenerationInputs: cmd.GenerationInputs{ - Dockerfile: "FROM openshift/ruby-22-centos7\nRUN yum install -y httpd", - To: "ruby-22-centos7", + Dockerfile: "FROM centos/ruby-25-centos7\nRUN yum install -y httpd", + To: "ruby-25-centos7", }, }, expected: map[string][]string{ - "buildConfig": {"ruby-22-centos7"}, - "imageStream": {"ruby-22-centos7"}, + "buildConfig": {"ruby-25-centos7"}, + "imageStream": {"ruby-25-centos7"}, }, checkOutput: func(stdout, stderr io.Reader) error { got, err := ioutil.ReadAll(stderr) if err != nil { return err } - want := "--> WARNING: output image of \"openshift/ruby-22-centos7:latest\" should be different than input\n" + want := "--> WARNING: output image of \"centos/ruby-25-centos7:latest\" should be different than input\n" if string(got) != want { return fmt.Errorf("stderr: got %q; want %q", got, want) } @@ -1602,12 +1602,12 @@ func TestNewAppBuildOutputCycleDetection(t *testing.T) { name: "unsuccessful build from dockerfile due to identical input and output image references(2)", config: &cmd.AppConfig{ GenerationInputs: cmd.GenerationInputs{ - Dockerfile: "FROM openshift/ruby-22-centos7\nRUN yum install -y httpd", + Dockerfile: "FROM centos/ruby-25-centos7\nRUN yum install -y httpd", }, }, expectedErr: func(err error) bool { e := app.CircularOutputReferenceError{ - Reference: "openshift/ruby-22-centos7:latest", + Reference: "centos/ruby-25-centos7:latest", } return err.Error() == fmt.Errorf("%v, set a different tag with --to", e).Error() }, @@ -1617,8 +1617,8 @@ func TestNewAppBuildOutputCycleDetection(t *testing.T) { config: &cmd.AppConfig{ GenerationInputs: cmd.GenerationInputs{ OutputDocker: true, - To: "centos/ruby-22-centos7", - Dockerfile: "FROM centos/ruby-22-centos7", + To: "centos/ruby-25-centos7", + Dockerfile: "FROM centos/ruby-25-centos7", }, Resolvers: cmd.Resolvers{ DockerSearcher: app.DockerClientSearcher{ @@ -1629,15 +1629,15 @@ func TestNewAppBuildOutputCycleDetection(t *testing.T) { }, }, expected: map[string][]string{ - "buildConfig": {"ruby-22-centos7"}, - "imageStream": {"ruby-22-centos7"}, + "buildConfig": {"ruby-25-centos7"}, + "imageStream": {"ruby-25-centos7"}, }, checkOutput: func(stdout, stderr io.Reader) error { got, err := ioutil.ReadAll(stderr) if err != nil { return err } - want := "--> WARNING: output image of \"centos/ruby-22-centos7:latest\" should be different than input\n" + want := "--> WARNING: output image of \"centos/ruby-25-centos7:latest\" should be different than input\n" if string(got) != want { return fmt.Errorf("stderr: got %q; want %q", got, want) } @@ -1649,8 +1649,8 @@ func TestNewAppBuildOutputCycleDetection(t *testing.T) { config: &cmd.AppConfig{ GenerationInputs: cmd.GenerationInputs{ OutputDocker: true, - To: "centos/ruby-22-centos7", - Dockerfile: "FROM centos/ruby-22-centos7:latest", + To: "centos/ruby-25-centos7", + Dockerfile: "FROM centos/ruby-25-centos7:latest", }, Resolvers: cmd.Resolvers{ DockerSearcher: app.DockerClientSearcher{ @@ -1661,15 +1661,15 @@ func TestNewAppBuildOutputCycleDetection(t *testing.T) { }, }, expected: map[string][]string{ - "buildConfig": {"ruby-22-centos7"}, - "imageStream": {"ruby-22-centos7"}, + "buildConfig": {"ruby-25-centos7"}, + "imageStream": {"ruby-25-centos7"}, }, checkOutput: func(stdout, stderr io.Reader) error { got, err := ioutil.ReadAll(stderr) if err != nil { return err } - want := "--> WARNING: output image of \"centos/ruby-22-centos7:latest\" should be different than input\n" + want := "--> WARNING: output image of \"centos/ruby-25-centos7:latest\" should be different than input\n" if string(got) != want { return fmt.Errorf("stderr: got %q; want %q", got, want) } @@ -1750,7 +1750,7 @@ func TestNewAppNewBuildEnvVars(t *testing.T) { config: &cmd.AppConfig{ ComponentInputs: cmd.ComponentInputs{ SourceRepositories: []string{"https://github.com/openshift/ruby-hello-world"}, - DockerImages: []string{"centos/ruby-22-centos7", "openshift/nodejs-010-centos7"}, + DockerImages: []string{"centos/ruby-25-centos7", "openshift/nodejs-010-centos7"}, }, GenerationInputs: cmd.GenerationInputs{ OutputDocker: true, @@ -1826,7 +1826,7 @@ func TestNewAppBuildConfigEnvVarsAndSecrets(t *testing.T) { config: &cmd.AppConfig{ ComponentInputs: cmd.ComponentInputs{ SourceRepositories: []string{"https://github.com/openshift/ruby-hello-world"}, - DockerImages: []string{"centos/ruby-22-centos7", "centos/mongodb-26-centos7"}, + DockerImages: []string{"centos/ruby-25-centos7", "centos/mongodb-26-centos7"}, }, GenerationInputs: cmd.GenerationInputs{ OutputDocker: true, @@ -2262,7 +2262,7 @@ func fakeDockerSearcher() app.Searcher { func fakeSimpleDockerSearcher() app.Searcher { return app.DockerClientSearcher{ Client: &apptest.FakeDockerClient{ - Images: []docker.APIImages{{RepoTags: []string{"centos/ruby-22-centos7"}}}, + Images: []docker.APIImages{{RepoTags: []string{"centos/ruby-25-centos7"}}}, Image: &docker.Image{ ID: "ruby", Config: &docker.Config{