Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pass minikube docker configuration to container-structure-test #2597

Merged

Conversation

corneliusweig
Copy link
Contributor

Fixes #1296

@codecov
Copy link

codecov bot commented Aug 2, 2019

Codecov Report

Merging #2597 into master will increase coverage by 0.02%.
The diff coverage is 86.66%.

Impacted Files Coverage Δ
pkg/skaffold/test/structure/structure.go 100% <100%> (ø) ⬆️
pkg/skaffold/test/structure/types.go 100% <100%> (ø) ⬆️
pkg/skaffold/test/test.go 94.28% <60%> (-5.72%) ⬇️

@balopat balopat added the kokoro:run runs the kokoro jobs on a PR label Aug 3, 2019
@kokoro-team kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Aug 3, 2019
@tejal29
Copy link
Contributor

tejal29 commented Aug 6, 2019

Thanks @corneliusweig. Have you verified if this works on when kubectl context is minikube?

@tejal29
Copy link
Contributor

tejal29 commented Aug 6, 2019

@corneliusweig can we add a unit test to make sure the env structure.NewRunner is actually plumbed through?

func (c *FakeCmd) WithRunEnv(command string, env map[string]string) *FakeCmd {
  return c.addRun(run{
		command: command,
		env: env,
	})
}

and then RunCmd should check if the

func (c *FakeCmd) RunCmd(cmd *exec.Cmd) error {
 ....
  if r.env != nil{
	if cmd.Env == r.cmd {
              // Error if both maps are not equal.
	}
 }
}

Copy link
Contributor

@tejal29 tejal29 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add tests.

@corneliusweig corneliusweig force-pushed the w/minikube-structure-test branch from a912112 to 5d234d8 Compare August 14, 2019 12:34
@corneliusweig
Copy link
Contributor Author

Hey @tejal29, sorry for my slow response, I was travelling. I did check that container-structure-test works correctly with minikube now. I also added a test to assert on correct plumbing of the env variables. So PTAL.

@corneliusweig corneliusweig force-pushed the w/minikube-structure-test branch from 5d234d8 to 1075fdc Compare August 14, 2019 22:27
@corneliusweig
Copy link
Contributor Author

Another victim of #2606. Let's hope for the next CI run :)

Copy link
Contributor

@tejal29 tejal29 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@balopat balopat closed this Aug 14, 2019
@balopat balopat reopened this Aug 14, 2019
@balopat balopat added the kokoro:run runs the kokoro jobs on a PR label Aug 14, 2019
@kokoro-team kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Aug 14, 2019
@corneliusweig corneliusweig force-pushed the w/minikube-structure-test branch from 1075fdc to 9e8a1f9 Compare August 15, 2019 08:36
@tejal29 tejal29 added the kokoro:run runs the kokoro jobs on a PR label Aug 15, 2019
@kokoro-team kokoro-team removed the kokoro:run runs the kokoro jobs on a PR label Aug 15, 2019
@nkubala nkubala merged commit d079d77 into GoogleContainerTools:master Aug 15, 2019
@corneliusweig corneliusweig deleted the w/minikube-structure-test branch August 15, 2019 20:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

skaffold dev fails to pass the image to container-structure-test correctly
6 participants