Skip to content

Update ruby-22-centos7 to ruby-25-centos7 #152

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Nov 8, 2019
Merged

Update ruby-22-centos7 to ruby-25-centos7 #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions pkg/cli/admin/buildchain/test/multiple-namespaces-bcs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
namespace: master
type: Docker
triggers:
Expand All @@ -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
Expand Down Expand Up @@ -66,7 +66,7 @@ items:
sourceStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
namespace: master
type: Source
triggers:
Expand All @@ -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
Expand All @@ -104,7 +104,7 @@ items:
sourceStrategy:
from:
kind: DockerImage
name: centos/ruby-22-centos7
name: centos/ruby-25-centos7
incremental: true
type: Source
triggers:
Expand Down Expand Up @@ -135,7 +135,7 @@ items:
sourceStrategy:
from:
kind: DockerImage
name: centos/ruby-22-centos7
name: centos/ruby-25-centos7
incremental: true
type: Source
triggers:
Expand Down
10 changes: 5 additions & 5 deletions pkg/cli/admin/buildchain/test/multiple-trigger-bcs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -39,7 +39,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Docker
triggers:
- github:
Expand Down Expand Up @@ -69,7 +69,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Docker
triggers:
- github:
Expand Down Expand Up @@ -99,7 +99,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Docker
triggers:
- github:
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions pkg/cli/admin/buildchain/test/single-namespace-bcs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Docker
triggers:
- github:
Expand All @@ -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
Expand Down Expand Up @@ -63,7 +63,7 @@ items:
sourceStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Source
triggers:
- github:
Expand All @@ -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
Expand All @@ -100,7 +100,7 @@ items:
sourceStrategy:
from:
kind: DockerImage
name: centos/ruby-22-centos7
name: centos/ruby-25-centos7
incremental: true
type: Source
triggers:
Expand Down Expand Up @@ -131,7 +131,7 @@ items:
sourceStrategy:
from:
kind: DockerImage
name: centos/ruby-22-centos7
name: centos/ruby-25-centos7
incremental: true
type: Source
triggers:
Expand Down
4 changes: 2 additions & 2 deletions pkg/cli/kubectlwrappers/wrappers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand Down
34 changes: 17 additions & 17 deletions pkg/helpers/describe/chaindescriber_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
Expand All @@ -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,
Expand All @@ -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.",
Expand All @@ -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{
"<master istag/ruby-22-centos7:latest>": 1,
"<master istag/ruby-25-centos7:latest>": 1,
"\t<default bc/ruby-hello-world>": 1,
"\t\t<test istag/ruby-hello-world:latest>": 1,
"\t<test bc/ruby-sample-build>": 1,
Expand All @@ -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.",
Expand All @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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,
},
Expand Down
12 changes: 6 additions & 6 deletions pkg/helpers/describe/projectstatus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <resource>/<name>' or list everything with 'oc get all'.",
Expand Down Expand Up @@ -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",
},
},
Expand All @@ -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 <resource>/<name>' or list everything with 'oc get all'.",
Expand 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 <someguy@outhere.com>)",
"View details with 'oc describe <resource>/<name>' or list everything with 'oc get all'.",
Expand 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",
Expand All @@ -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"),
Expand Down
6 changes: 3 additions & 3 deletions pkg/helpers/graph/genericgraph/test/bare-bc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -36,7 +36,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Docker
triggers:
- github:
Expand Down
6 changes: 3 additions & 3 deletions pkg/helpers/graph/genericgraph/test/bare-dc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -36,7 +36,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Docker
triggers:
- github:
Expand Down
4 changes: 2 additions & 2 deletions pkg/helpers/graph/genericgraph/test/circular-not.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ items:
kind: BuildConfig
metadata:
creationTimestamp: null
name: ruby-22-centos7
name: ruby-25-centos7
spec:
output:
to:
Expand All @@ -19,7 +19,7 @@ items:
dockerStrategy:
from:
kind: ImageStreamTag
name: ruby-22-centos7:latest
name: ruby-25-centos7:latest
type: Docker
triggers:
- github:
Expand Down
Loading