Skip to content

Commit

Permalink
test: Skip unpacking file contents except when the test is actually r…
Browse files Browse the repository at this point in the history
…unning

In general test startup should do a minimal amount of static work before
the test suite runs. Set up guard rails within exutil that prevent tests
from running commands. Standardize the setup of the test process now that
key methods on the kube Framework are public. Standardize how exutil is
included and called in all packages.

The command test is switched to asking for a list of filenames from the
fixtures. The multicast test no longer instantiates a framework outside
of a block. Ensure that fixtures are cleaned up after the test exits
instead of being left around.
  • Loading branch information
smarterclayton committed Mar 25, 2020
1 parent 927b43c commit 5c89a37
Show file tree
Hide file tree
Showing 154 changed files with 411 additions and 391 deletions.
4 changes: 2 additions & 2 deletions cmd/openshift-tests/openshift-tests.go
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ func newRunTestCommand() *cobra.Command {
return err
}
exutil.TestContext.ReportDir = upgradeOpts.JUnitDir

return testOpt.Run(args)
exutil.WithCleanup(func() { err = testOpt.Run(args) })
return err
},
}
cmd.Flags().BoolVar(&testOpt.DryRun, "dry-run", testOpt.DryRun, "Print the test to run without executing them.")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ import (
var _ = g.Describe("[<test bucket>] <Testing scenario>", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("test-name", exutil.KubeConfigPath())
oc = exutil.NewCLI("test-name")
testFixture = filepath.Join("testdata", "test.json")
)
})
Expand Down
2 changes: 1 addition & 1 deletion test/extended/apiserver/config_admission_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
var _ = g.Describe("[sig-api-machinery][Feature:APIServer]", func() {
defer g.GinkgoRecover()

oc := exutil.NewCLI("apiserver", exutil.KubeConfigPath())
oc := exutil.NewCLI("apiserver")

g.It("validates APIServer in config.openshift.io/v1", func() {
client, err := dynamic.NewForConfig(oc.AdminConfig())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/apiserver/root_403.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
var _ = g.Describe("[sig-api-machinery][Feature:APIServer]", func() {
defer g.GinkgoRecover()

oc := exutil.NewCLI("apiserver", exutil.KubeConfigPath())
oc := exutil.NewCLI("apiserver")

g.It("anonymous browsers should get a 403 from /", func() {
transport, err := anonymousHttpTransport(oc.AdminConfig())
Expand Down
2 changes: 1 addition & 1 deletion test/extended/apiserver/tls.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
var _ = g.Describe("[sig-api-machinery][Feature:APIServer]", func() {
defer g.GinkgoRecover()

oc := exutil.NewCLI("apiserver", exutil.KubeConfigPath())
oc := exutil.NewCLI("apiserver")

g.It("TestTLSDefaults", func() {
g.Skip("skipping because it was broken in master")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/authentication/front_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (

var _ = g.Describe("[sig-auth][Feature:Authentication] ", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("project-api", exutil.KubeConfigPath())
oc := exutil.NewCLI("project-api")

g.Describe("TestFrontProxy", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down
10 changes: 5 additions & 5 deletions test/extended/authorization/authorization.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import (

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] authorization", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("bootstrap-policy", exutil.KubeConfigPath())
oc := exutil.NewCLI("bootstrap-policy")

g.Context("", func() {
g.Describe("TestClusterReaderCoverage", func() {
Expand Down Expand Up @@ -369,7 +369,7 @@ func (test localResourceAccessReviewTest) run() {
// serial because it is vulnerable to access added by other tests
var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization][Serial] authorization", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("bootstrap-policy", exutil.KubeConfigPath())
oc := exutil.NewCLI("bootstrap-policy")

g.Context("", func() {
g.Describe("TestAuthorizationResourceAccessReview", func() {
Expand Down Expand Up @@ -468,7 +468,7 @@ var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization][Serial] authoriza

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] authorization", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("bootstrap-policy", exutil.KubeConfigPath())
oc := exutil.NewCLI("bootstrap-policy")

g.Context("", func() {
g.Describe("TestAuthorizationSubjectAccessReview", func() {
Expand Down Expand Up @@ -1023,7 +1023,7 @@ func AddUserViewToProject(oc *exutil.CLI, namespace, user string) string {

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] authorization", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("bootstrap-policy", exutil.KubeConfigPath())
oc := exutil.NewCLI("bootstrap-policy")

g.Context("", func() {
g.Describe("TestAuthorizationSubjectAccessReviewAPIGroup", func() {
Expand Down Expand Up @@ -1159,7 +1159,7 @@ var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] authorization", f

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] authorization", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("bootstrap-policy", exutil.KubeConfigPath())
oc := exutil.NewCLI("bootstrap-policy")

g.Context("", func() {
g.Describe("TestBrowserSafeAuthorizer", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/authorization/authorization_rbac_proxy.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] RBAC proxy for openshift authz", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("rbac-proxy", exutil.KubeConfigPath())
oc := exutil.NewCLI("rbac-proxy")
g.Context("", func() {
g.Describe("RunLegacyLocalRoleBindingEndpoint", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/authorization/rbac/groups_default_rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ var (
var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] The default cluster RBAC policy", func() {
defer g.GinkgoRecover()

oc := exutil.NewCLI("default-rbac-policy", exutil.KubeConfigPath())
oc := exutil.NewCLI("default-rbac-policy")

g.It("should have correct RBAC rules", func() {
kubeInformers := informers.NewSharedInformerFactory(oc.AdminKubeClient(), 20*time.Minute)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/authorization/rolebinding_restrictions.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

var _ = g.Describe("[sig-auth][Feature:RoleBindingRestrictions] RoleBindingRestrictions should be functional", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("rolebinding-restrictions", exutil.KubeConfigPath())
oc := exutil.NewCLI("rolebinding-restrictions")
g.Context("", func() {
g.Describe("Create a rolebinding when there are no restrictions", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down
10 changes: 5 additions & 5 deletions test/extended/authorization/scopes.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("scopes", exutil.KubeConfigPath())
oc := exutil.NewCLI("scopes")

g.Describe("TestScopedTokens", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down Expand Up @@ -99,7 +99,7 @@ var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("scopes", exutil.KubeConfigPath())
oc := exutil.NewCLI("scopes")

g.Describe("TestScopedImpersonation", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down Expand Up @@ -134,7 +134,7 @@ var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("scopes", exutil.KubeConfigPath())
oc := exutil.NewCLI("scopes")

g.Describe("TestScopeEscalations", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down Expand Up @@ -209,7 +209,7 @@ var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("scopes", exutil.KubeConfigPath())
oc := exutil.NewCLI("scopes")

g.Describe("TestTokensWithIllegalScopes", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down Expand Up @@ -440,7 +440,7 @@ var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] scopes", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("scopes", exutil.KubeConfigPath())
oc := exutil.NewCLI("scopes")

g.Describe("TestUnknownScopes", func() {
g.It(fmt.Sprintf("should succeed"), func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/authorization/self_sar.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (

var _ = g.Describe("[sig-auth][Feature:OpenShiftAuthorization] self-SAR compatibility", func() {
defer g.GinkgoRecover()
oc := exutil.NewCLI("bootstrap-policy", exutil.KubeConfigPath())
oc := exutil.NewCLI("bootstrap-policy")

g.Context("", func() {
g.Describe("TestBootstrapPolicySelfSubjectAccessReviews", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/bootstrap_user/bootstrap_user_login.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var _ = g.Describe("[sig-auth][Feature:BootstrapUser] The bootstrap user", func(

// since login mutates the current kubeconfig we want to use NewCLI
// as that will give each one of our test runs a new config via SetupProject
oc := exutil.NewCLI("bootstrap-login", exutil.KubeConfigPath())
oc := exutil.NewCLI("bootstrap-login")

g.It("should successfully login with password decoded from kubeadmin secret [Disruptive]", func() {
var originalPasswordHash []byte
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/build_pruning.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] prune builds based on settings
failedBuildConfig = filepath.Join(buildPruningBaseDir, "failed-build-config.yaml")
erroredBuildConfig = filepath.Join(buildPruningBaseDir, "errored-build-config.yaml")
groupBuildConfig = filepath.Join(buildPruningBaseDir, "default-group-build-config.yaml")
oc = exutil.NewCLI("build-pruning", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-pruning")
pollingInterval = time.Second
timeout = time.Minute
)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/build_timing.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][timing] capture build stages an
dockerBuildDockerfile = filepath.Join(buildTimingBaseDir, "Dockerfile")
sourceBuildFixture = filepath.Join(buildTimingBaseDir, "test-s2i-build.json")
sourceBuildBinDir = filepath.Join(buildTimingBaseDir, "s2i-binary-dir")
oc = exutil.NewCLI("build-timing", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-timing")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/buildconfigsecretinjector.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] buildconfig secret injector", f

var (
itemsPath = exutil.FixturePath("testdata", "builds", "test-buildconfigsecretinjector.yaml")
oc = exutil.NewCLI("buildconfigsecretinjector", exutil.KubeConfigPath())
oc = exutil.NewCLI("buildconfigsecretinjector")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/cluster_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Serial][Slow][Disruptive] alter
blacklistConfigFixture = exutil.FixturePath("testdata", "builds", "cluster-config", "registry-blacklist.yaml")
whitelistConfigFixture = exutil.FixturePath("testdata", "builds", "cluster-config", "registry-whitelist.yaml")
invalidproxyConfigFixture = exutil.FixturePath("testdata", "builds", "cluster-config", "invalid-build-cluster-config.yaml")
oc = exutil.NewCLI("build-cluster-config", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-cluster-config")
checkPodProxyEnvs = func(containers []v1.Container, proxySpec *configv1.ProxySpec) {
o.Expect(containers).NotTo(o.BeNil())
foundHTTP := false
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/completiondeadlineseconds.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] builds should have deadli
var (
sourceFixture = exutil.FixturePath("testdata", "builds", "test-cds-sourcebuild.json")
dockerFixture = exutil.FixturePath("testdata", "builds", "test-cds-dockerbuild.json")
oc = exutil.NewCLI("cli-start-build", exutil.KubeConfigPath())
oc = exutil.NewCLI("cli-start-build")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/contextdir.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] builds with a context dir
defer g.GinkgoRecover()
var (
appFixture = exutil.FixturePath("testdata", "builds", "test-context-build.json")
oc = exutil.NewCLI("contextdir", exutil.KubeConfigPath())
oc = exutil.NewCLI("contextdir")
s2iBuildConfigName = "s2icontext"
s2iBuildName = "s2icontext-1"
dcName = "frontend"
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/controller_compat.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
var _ = g.Describe("[sig-builds][Feature:Builds][Slow] build controller", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("build-controllers", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-controllers")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/custom_build.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
var _ = g.Describe("[sig-builds][Feature:Builds] custom build with buildah", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("custom-build", exutil.KubeConfigPath())
oc = exutil.NewCLI("custom-build")
customBuildAdd = exutil.FixturePath("testdata", "builds", "custom-build")
customBuildFixture = exutil.FixturePath("testdata", "builds", "test-custom-build.yaml")
)
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/digest.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] completed builds should h
imageStreamFixture = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
stiBuildFixture = exutil.FixturePath("testdata", "builds", "test-s2i-build.json")
dockerBuildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build.json")
oc = exutil.NewCLI("build-sti-labels", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-sti-labels")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/docker_pullsecret.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][pullsecret] docker build using

var (
buildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build-pullsecret.json")
oc = exutil.NewCLI("docker-build-pullsecret", exutil.KubeConfigPath())
oc = exutil.NewCLI("docker-build-pullsecret")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/dockerfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
var _ = g.Describe("[sig-builds][Feature:Builds][Slow] build can have Dockerfile input", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("build-dockerfile-env", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-dockerfile-env")
dockerfileAdd = exutil.FixturePath("testdata", "builds", "docker-add")
testDockerfile = `
FROM library/busybox
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/failure_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] update failure status", f
failedAssembleFixture = exutil.FixturePath("testdata", "builds", "statusfail-failedassemble.yaml")
failedGenericReason = exutil.FixturePath("testdata", "builds", "statusfail-genericreason.yaml")
binaryBuildDir = exutil.FixturePath("testdata", "builds", "statusfail-assemble")
oc = exutil.NewCLI("update-buildstatus", exutil.KubeConfigPath())
oc = exutil.NewCLI("update-buildstatus")
StatusMessagePushImageToRegistryFailed = "Failed to push the image to the registry."
StatusMessagePullBuilderImageFailed = "Failed pulling builder image."
StatusMessageFetchSourceFailed = "Failed to fetch the input source."
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/forcepull.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ be a quick fix.

var _ = g.Describe("[sig-builds][Feature:Builds] forcePull should affect pulling builder images", func() {
defer g.GinkgoRecover()
var oc = exutil.NewCLI("forcepull", exutil.KubeConfigPath())
var oc = exutil.NewCLI("forcepull")

g.Context("", func() {

Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/gitauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] can use private repositor
var (
gitServerFixture = exutil.FixturePath("testdata", "test-gitserver.yaml")
testBuildFixture = exutil.FixturePath("testdata", "builds", "test-auth-build.yaml")
oc = exutil.NewCLI("build-sti-private-repo", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-sti-private-repo")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] testing build configurati
dockerBuildFixture = exutil.FixturePath("testdata", "builds", "build-postcommit", "docker.yaml")
s2iBuildFixture = exutil.FixturePath("testdata", "builds", "build-postcommit", "sti.yaml")
imagestreamFixture = exutil.FixturePath("testdata", "builds", "build-postcommit", "imagestreams.yaml")
oc = exutil.NewCLI("cli-test-hooks", exutil.KubeConfigPath())
oc = exutil.NewCLI("cli-test-hooks")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/image_source.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds][Slow] build can have container
s2iBuildFixture = exutil.FixturePath("testdata", "builds", "test-imageresolution-s2i-build.yaml")
dockerBuildFixture = exutil.FixturePath("testdata", "builds", "test-imageresolution-docker-build.yaml")
customBuildFixture = exutil.FixturePath("testdata", "builds", "test-imageresolution-custom-build.yaml")
oc = exutil.NewCLI("build-image-source", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-image-source")
imageSourceLabel = exutil.ParseLabelsOrDie("app=imagesourceapp")
imageDockerLabel = exutil.ParseLabelsOrDie("app=imagedockerapp")
sourceBuildLabel = exutil.ParseLabelsOrDie("openshift.io/build.name=imagesourcebuild")
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/imagechangetriggers.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] imagechangetriggers", func() {

var (
buildFixture = exutil.FixturePath("testdata", "builds", "test-imagechangetriggers.yaml")
oc = exutil.NewCLI("imagechangetriggers", exutil.KubeConfigPath())
oc = exutil.NewCLI("imagechangetriggers")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/labels.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] result image should have proper
imageStreamFixture = exutil.FixturePath("..", "integration", "testdata", "test-image-stream.json")
stiBuildFixture = exutil.FixturePath("testdata", "builds", "test-s2i-build.json")
dockerBuildFixture = exutil.FixturePath("testdata", "builds", "test-docker-build.json")
oc = exutil.NewCLI("build-sti-labels", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-sti-labels")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/multistage.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
var _ = g.Describe("[sig-builds][Feature:Builds] Multi-stage image builds", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("build-multistage", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-multistage")
testDockerfile = `
FROM scratch as test
USER 1001
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/new_app.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] oc new-app", func() {
// whose name itself includes the app name. Ensure we can create and fully
// deploy an app with a 58 character name [63 maximum - len('-9999' suffix)].

oc := exutil.NewCLI("new-app", exutil.KubeConfigPath())
oc := exutil.NewCLI("new-app")

g.Context("", func() {

Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/no_outputname.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] build without output image", fu
var (
dockerImageFixture = exutil.FixturePath("testdata", "builds", "test-docker-no-outputname.json")
s2iImageFixture = exutil.FixturePath("testdata", "builds", "test-s2i-no-outputname.json")
oc = exutil.NewCLI("build-no-outputname", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-no-outputname")
)

g.Context("", func() {
Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/nosrc.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ var _ = g.Describe("[sig-builds][Feature:Builds] build with empty source", func(
defer g.GinkgoRecover()
var (
buildFixture = exutil.FixturePath("testdata", "builds", "test-nosrc-build.json")
oc = exutil.NewCLI("cli-build-nosrc", exutil.KubeConfigPath())
oc = exutil.NewCLI("cli-build-nosrc")
exampleBuild = exutil.FixturePath("testdata", "builds", "test-build-app")
)

Expand Down
2 changes: 1 addition & 1 deletion test/extended/builds/optimized.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
var _ = g.Describe("[sig-builds][Feature:Builds] Optimized image builds", func() {
defer g.GinkgoRecover()
var (
oc = exutil.NewCLI("build-dockerfile-env", exutil.KubeConfigPath())
oc = exutil.NewCLI("build-dockerfile-env")
skipLayers = buildv1.ImageOptimizationSkipLayers
testDockerfile = `
FROM centos:7
Expand Down

0 comments on commit 5c89a37

Please sign in to comment.