@@ -142,9 +142,9 @@ var _ = Describe("odo generic", Label(helper.LabelSkipOnOpenShift), func() {
142
142
Expect (odoVersion ).To (ContainSubstring (helper .GetPodmanVersion ()))
143
143
} else {
144
144
Expect (odoVersion ).Should (MatchRegexp (reKubernetesVersion ))
145
- serverURL := oc .GetCurrentServerURL ()
146
- Expect (odoVersion ).Should (ContainSubstring ("Server: " + serverURL ))
147
145
if ! helper .IsKubernetesCluster () {
146
+ serverURL := oc .GetCurrentServerURL ()
147
+ Expect (odoVersion ).Should (ContainSubstring ("Server: " + serverURL ))
148
148
ocpMatcher := ContainSubstring ("OpenShift: " )
149
149
if serverVersion := commonVar .CliRunner .GetVersion (); serverVersion == "" {
150
150
// Might indicate a user permission error on certain clusters (observed with a developer account on Prow nightly jobs)
@@ -164,9 +164,9 @@ var _ = Describe("odo generic", Label(helper.LabelSkipOnOpenShift), func() {
164
164
helper .JsonPathSatisfiesAll (odoVersion , "podman.client.version" , MatchRegexp (reJSONVersion ), Equal (helper .GetPodmanVersion ()))
165
165
} else {
166
166
helper .JsonPathSatisfiesAll (odoVersion , "cluster.kubernetes.version" , MatchRegexp (reJSONVersion ))
167
- serverURL := oc .GetCurrentServerURL ()
168
- helper .JsonPathContentIs (odoVersion , "cluster.serverURL" , serverURL )
169
167
if ! helper .IsKubernetesCluster () {
168
+ serverURL := oc .GetCurrentServerURL ()
169
+ helper .JsonPathContentIs (odoVersion , "cluster.serverURL" , serverURL )
170
170
m := BeEmpty ()
171
171
if serverVersion := commonVar .CliRunner .GetVersion (); serverVersion != "" {
172
172
// A blank serverVersion might indicate a user permission error on certain clusters (observed with a developer account on Prow nightly jobs)
0 commit comments