Skip to content

Commit b3dfe24

Browse files
Merge pull request #30620 from openshift-cherrypick-robot/cherry-pick-30610-to-release-4.20
[release-4.20] OCPBUGS-69686: BeforeEach was indirectly called in DetermineReleasePayloadImage
2 parents f68cadc + d09fd27 commit b3dfe24

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pkg/test/extensions/util.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import (
88
"encoding/json"
99
"fmt"
1010
"io"
11-
kapierrs "k8s.io/apimachinery/pkg/api/errors"
1211
"os"
1312
"os/exec"
1413
"path"
@@ -18,6 +17,8 @@ import (
1817
"strings"
1918
"time"
2019

20+
kapierrs "k8s.io/apimachinery/pkg/api/errors"
21+
2122
"github.com/openshift-eng/openshift-tests-extension/pkg/dbtime"
2223
"github.com/sirupsen/logrus"
2324

@@ -182,7 +183,7 @@ func DetermineReleasePayloadImage() (string, error) {
182183

183184
if len(releaseImage) == 0 {
184185
// Note that MicroShift does not have this resource. The test driver must use ENV vars.
185-
oc := util.NewCLIWithoutNamespace("default")
186+
oc := util.NewCLIForMonitorTest("default")
186187
cv, err := oc.AdminConfigClient().ConfigV1().ClusterVersions().Get(context.TODO(), "version",
187188
metav1.GetOptions{})
188189
if err != nil {

0 commit comments

Comments
 (0)