Merge pull request #22902 from dmage/samples-config

openshift-merge-robot · web-flow · commit e8c929e8b7a9 · 2019-05-24T21:35:13.000+02:00
Use new name for sample operator config
diff --git a/test/extended/util/framework.go b/test/extended/util/framework.go
@@ -158,7 +158,7 @@ func DumpImageStreams(oc *CLI) {
 }
 
 func DumpSampleOperator(oc *CLI) {
-	out, err := oc.AsAdmin().Run("get").Args("configs.samples.operator.openshift.io", "instance", "-n", "openshift-cluster-samples-operator", "-o", "yaml", "--config", KubeConfigPath()).Output()
+	out, err := oc.AsAdmin().Run("get").Args("configs.samples.operator.openshift.io", "cluster", "-o", "yaml", "--config", KubeConfigPath()).Output()
 	if err == nil {
 		e2e.Logf("\n  samples operator CR: \n%s\n", out)
 	} else {

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func DumpImageStreams(oc *CLI) {`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`func DumpSampleOperator(oc *CLI) {`
`161`		`- out, err := oc.AsAdmin().Run("get").Args("configs.samples.operator.openshift.io", "instance", "-n", "openshift-cluster-samples-operator", "-o", "yaml", "--config", KubeConfigPath()).Output()`
	`161`	`+ out, err := oc.AsAdmin().Run("get").Args("configs.samples.operator.openshift.io", "cluster", "-o", "yaml", "--config", KubeConfigPath()).Output()`
`162`	`162`	`if err == nil {`
`163`	`163`	`e2e.Logf("\n samples operator CR: \n%s\n", out)`
`164`	`164`	`} else {`