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

Extend skaffold debug integration tests to buildpacks #4352

Merged
merged 5 commits into from
Jun 23, 2020

Conversation

briandealwis
Copy link
Member

Description

Extends integration tests for debug to test building with GCP Buildpacks using both Procfiles and the new project.toml. We reuse the existing test projects rather than define new projects. Like the existing tests, it continues to check that the language debugging runtimes are enabled and responding.

These tests verify that pods and deployments are annotated with the debug configuration metadata and contains the working-directory and runtime. These annotations are used to drive the DebuggingContainerEvent event.

Other changes:

  • Ensures all images have a working-directory so that the field is set in the debug configuration metadata.
  • Renames the jib tests to java since the buildpacks mode doesn't use Jib.
  • Causes the check-jdwp.sh script to be placed in /workspace/scripts to be in the same place with both Jib and Buildpacks images.

Extends integration tests to test `debug` with GCP Buildpacks using
both Procfiles and the new project.toml.
@codecov
Copy link

codecov bot commented Jun 19, 2020

Codecov Report

Merging #4352 into master will decrease coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4352      +/-   ##
==========================================
- Coverage   71.76%   71.71%   -0.05%     
==========================================
  Files         324      324              
  Lines       12512    12514       +2     
==========================================
- Hits         8979     8975       -4     
- Misses       2965     2969       +4     
- Partials      568      570       +2     
Impacted Files Coverage Δ
cmd/skaffold/app/cmd/dev.go 82.85% <0.00%> (-3.81%) ⬇️
pkg/skaffold/debug/transform_nodejs.go 79.62% <0.00%> (-1.24%) ⬇️
pkg/skaffold/build/custom/script.go 52.08% <0.00%> (-1.11%) ⬇️
pkg/skaffold/deploy/kubectl.go 67.10% <0.00%> (-0.68%) ⬇️
pkg/skaffold/deploy/kustomize.go 77.05% <0.00%> (-0.66%) ⬇️
pkg/skaffold/config/util.go 70.71% <0.00%> (-0.55%) ⬇️
pkg/skaffold/test/test.go 100.00% <0.00%> (ø)
pkg/skaffold/debug/debug.go 45.16% <0.00%> (ø)
cmd/skaffold/app/cmd/debug.go 100.00% <0.00%> (ø)
cmd/skaffold/app/cmd/flags.go 86.36% <0.00%> (ø)
... and 3 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0a9c1ab...e6bf12c. Read the comment docs.

Copy link
Contributor

@dgageot dgageot left a comment

Choose a reason for hiding this comment

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

LGTM with a couple of nits

configurations:

- `skaffold.yaml` configures docker- and jib-based builders
- `skaffold-bp.yaml` configures buildpacks-based builders
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you use two profiles?

args []string
deployments []string
pods []string

Copy link
Contributor

Choose a reason for hiding this comment

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

linter complains on the new line

@briandealwis briandealwis added kokoro:run runs the kokoro jobs on a PR kokoro:force-run forces a kokoro re-run on a PR and removed kokoro:run runs the kokoro jobs on a PR labels Jun 23, 2020
@kokoro-team kokoro-team removed the kokoro:force-run forces a kokoro re-run on a PR label Jun 23, 2020
@briandealwis briandealwis merged commit 22135d7 into GoogleContainerTools:master Jun 23, 2020
@briandealwis briandealwis deleted the debug-it-bp branch June 23, 2020 14:31
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.

4 participants