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

Fix dns test on windows. #518

Merged

Conversation

Random-Liu
Copy link
Contributor

@Random-Liu Random-Liu commented Aug 30, 2019

For containerd/cri#1257.

This PR:

  1. Fixes image digest test on windows. gcr.io/cri-tools/win-test-image-digest@sha256:05c5e07eab041551e466d6e33a0a5649a23a929cd236391b2835ec79dc245090 doesn't exist any more;
  2. Fix DNS test on windows. ipconfig /all is used. It is also used in the kubernetes test. https://www.google.com/url?q=https://github.com/kubernetes/kubernetes/pull/74925/files%23diff-2015820514e84c3683c7bf7ee59cfd01R67&sa=D&source=hangouts&ust=1567286927143000&usg=AFQjCNGnU6Ym0MFGkSGXQFj5jMRtcQk6yw
  3. Move apparmor.go to apparmor_linux.go. It is linux specific.

Signed-off-by: Lantao Liu [email protected]

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Aug 30, 2019
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 30, 2019
@Random-Liu
Copy link
Contributor Author

/cc @yujuhong @feiskyer

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Aug 30, 2019
@Random-Liu Random-Liu force-pushed the fix-critest-on-windows branch from 1660666 to f42de13 Compare August 30, 2019 21:57
Signed-off-by: Lantao Liu <[email protected]>
@Random-Liu Random-Liu force-pushed the fix-critest-on-windows branch from f42de13 to 39f2e2b Compare August 30, 2019 21:59
@yujuhong
Copy link
Contributor

/lgtm
Thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 30, 2019
@k8s-ci-robot k8s-ci-robot merged commit 3df3f02 into kubernetes-sigs:master Aug 30, 2019
@Random-Liu Random-Liu deleted the fix-critest-on-windows branch August 30, 2019 23:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants