Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/examples/source/devfiles/springboot/devfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ starterProjects:
components:
- name: tools
container:
image: quay.io/eclipse/che-java11-maven:next
image: registry.access.redhat.com/ubi8/openjdk-11:latest
memoryLimit: 768Mi
command: ['tail']
args: [ '-f', '/dev/null']
Expand All @@ -22,7 +22,7 @@ components:
path: /data/cache/.m2
- name: runtime
container:
image: quay.io/eclipse/che-java11-maven:next
image: registry.access.redhat.com/ubi8/openjdk-11:latest
memoryLimit: 768Mi
endpoints:
- name: "8080-tcp"
Expand Down
10 changes: 7 additions & 3 deletions tests/helper/helper_dev.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,14 @@ func RunDevMode(options DevSessionOpts, inside func(session *gexec.Session, outC
// `odo dev` runs in an infinite reconciliation loop, and hence running it with Cmd will not work for a lot of failing cases,
// this function is helpful in such cases.
// TODO(pvala): Modify StartDevMode to take substring arg into account, and replace this method with it.
func DevModeShouldFail(envvars []string, substring string, opts ...string) (DevSession, []byte, []byte, error) {
func DevModeShouldFail(options DevSessionOpts, substring string) (DevSession, []byte, []byte, error) {
args := []string{"dev", "--random-ports"}
args = append(args, opts...)
session := Cmd("odo", args...).AddEnv(envvars...).Runner().session
args = append(args, options.CmdlineArgs...)
if options.RunOnPodman {
args = append(args, "--platform", "podman")
options.EnvVars = append(options.EnvVars, "ODO_EXPERIMENTAL_MODE=true")
}
session := Cmd("odo", args...).AddEnv(options.EnvVars...).Runner().session
WaitForOutputToContain(substring, 360, 10, session)
result := DevSession{
session: session,
Expand Down
Loading