Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
lilyLuLiu committed Dec 31, 2024
1 parent 1e878af commit 1c56660
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 7 deletions.
2 changes: 1 addition & 1 deletion test/e2e/features/story_openshift.feature
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Feature: 4 Openshift stories
Given executing "oc new-project testproj" succeeds
# mirror
When executing "oc registry login --insecure=true" succeeds
Then executing "oc image mirror registry.access.redhat.com/ubi8/httpd-24:latest=default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test --insecure=true --filter-by-os=linux/amd64" succeeds
Then executing "oc image mirror registry.access.redhat.com/ubi8/httpd-24:latest=default-route-openshift-image-registry.apps-crc.testing/testproj/hello:test --insecure=true" succeeds
And executing "oc set image-lookup hello" succeeds
# deploy
When executing "oc apply -f hello.yaml" succeeds
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/testsuite/testsuite.go
Original file line number Diff line number Diff line change
Expand Up @@ -213,9 +213,8 @@ func InitializeScenario(s *godog.ScenarioContext) {
}

if tag.Name == "@proxy" {

// start container with squid proxy
err := util.ExecuteCommand("podman run --name squid -d -p 3128:3128 quay.io/crcont/squid")
err := util.ExecuteCommand("sudo dnf install podman -y;podman run --name squid -d -p 3128:3128 quay.io/crcont/squid")
if err != nil {
fmt.Println(err)
os.Exit(1)
Expand Down
4 changes: 0 additions & 4 deletions test/integration/proxy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package test_test
import (
"os"
"os/exec"
"runtime"

crc "github.com/crc-org/crc/v2/test/extended/crc/cmd"
"github.com/crc-org/crc/v2/test/extended/util"
Expand Down Expand Up @@ -48,9 +47,6 @@ var _ = Describe("", Serial, Ordered, Label("openshift-preset", "goproxy"), func
Expect(RunCRCExpectSuccess("config", "set", "https-proxy", httpsProxy)).To(ContainSubstring("Successfully configured https-proxy"))
Expect(RunCRCExpectSuccess("config", "set", "no-proxy", noProxy)).To(ContainSubstring("Successfully configured no-proxy"))
Expect(RunCRCExpectSuccess("config", "set", "proxy-ca-file", util.CACertTempLocation)).To(ContainSubstring("Successfully configured proxy-ca-file"))
if runtime.GOOS != "linux" {
Expect(RunCRCExpectSuccess("config", "set", "host-network-access", "true")).To(ContainSubstring("Changes to configuration property 'host-network-access' are only applied during 'crc setup'"))
}
})

It("setup CRC", func() {
Expand Down

0 comments on commit 1c56660

Please sign in to comment.