diff --git a/test/integration/resize_test.go b/test/integration/resize_test.go index a2867b06af..a535ba3eeb 100644 --- a/test/integration/resize_test.go +++ b/test/integration/resize_test.go @@ -12,12 +12,16 @@ var _ = Describe("vary VM parameters: memory cpus, disk", func() { Describe("use default values", func() { It("setup CRC", func() { - Expect(RunCRCExpectSuccess("setup")).To(ContainSubstring("Your system is correctly setup for using CodeReady Containers")) + if bundlePath == "" { + Expect(RunCRCExpectSuccess("setup")).To(ContainSubstring("Your system is correctly setup for using CodeReady Containers")) + } else { + Expect(RunCRCExpectSuccess("setup", "-b", bundlePath)).To(ContainSubstring("Your system is correctly setup for using CodeReady Containers")) + } }) It("start CRC", func() { // default values: "--memory", "9216", "--cpus", "4", "disk-size", "31" - if bundlePath == "embedded" { + if bundlePath == "" { Expect(RunCRCExpectSuccess("start", "-p", pullSecretPath)).To(ContainSubstring("Started the OpenShift cluster")) } else { Expect(RunCRCExpectSuccess("start", "-b", bundlePath, "-p", pullSecretPath)).To(ContainSubstring("Started the OpenShift cluster")) diff --git a/test/integration/testsuite_test.go b/test/integration/testsuite_test.go index a425889d42..099c68446f 100644 --- a/test/integration/testsuite_test.go +++ b/test/integration/testsuite_test.go @@ -17,7 +17,6 @@ type VersionAnswer struct { Version string `json:"version"` Commit string `json:"commit"` OpenshiftVersion string `json:"openshiftVersion"` - Embedded bool `json:"embedded"` } var credPath string @@ -54,13 +53,9 @@ var _ = BeforeSuite(func() { Expect(err).NotTo(HaveOccurred()) - // bundle location - bundlePath = "embedded" - if !versionInfo.Embedded { - bundlePath = os.Getenv("BUNDLE_PATH") // this env var should contain location of bundle or string "embedded" - if bundlePath != "embedded" { // if real bundle - Expect(bundlePath).To(BeAnExistingFile()) - } + bundlePath = os.Getenv("BUNDLE_PATH") // this env var should contain location of bundle + if bundlePath != "" { + Expect(bundlePath).To(BeAnExistingFile()) } // pull-secret location