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.

Sign up for GitHub

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

Jump to bottom

Move conformance image #103874

Merged
merged 2 commits into from
Aug 5, 2021
Merged

Move conformance image #103874

merged 2 commits into from
Aug 5, 2021

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Jul 23, 2021

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Moves the conformance image out of deprecated cluster directory

Which issue(s) this PR fixes:

Fixes #103867

Does this PR introduce a user-facing change?

NONE

/cc @benhxy @spiffxp @dims

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jul 23, 2021
@k8s-ci-robot k8s-ci-robot added kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 23, 2021
@k8s-ci-robot k8s-ci-robot requested a review from dims July 23, 2021 14:22
@k8s-ci-robot
Copy link
Contributor

@liggitt: GitHub didn't allow me to request PR reviews from the following users: benhxy.

Note that only kubernetes members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Moves the conformance image out of deprecated cluster directory

Which issue(s) this PR fixes:

Fixes #103867

Does this PR introduce a user-facing change?

NONE

/cc @benhxy @spiffxp @dims

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 23, 2021
@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021

/sig testing

@k8s-ci-robot k8s-ci-robot added sig/testing Categorizes an issue or PR as relevant to SIG Testing. approved Indicates a PR has been approved by an approver from all required OWNERS files. area/test and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 23, 2021
@dims
Copy link
Member

dims commented Jul 23, 2021

+1 from me! for 1.23 we'll need to fix up references outside this repo when the time comes - https://cs.k8s.io/?q=cluster%2Fimages%2Fconformance&i=nope&files=&excludeFiles=&repos=kubernetes/test-infra

@dims
Copy link
Member

dims commented Jul 23, 2021

/assign

@dims
Copy link
Member

dims commented Jul 23, 2021

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 23, 2021
@dims
Copy link
Member

dims commented Jul 23, 2021

/triage accepted
/area code-organization

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. area/code-organization Issues or PRs related to kubernetes code organization and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 23, 2021
@spiffxp
Copy link
Member

spiffxp commented Jul 23, 2021

Does this work with https://github.com/kubernetes/kubernetes/blob/master/test/images/image-util.sh?

Or put another way, can it be built via https://github.com/kubernetes/kubernetes/blob/master/test/images/cloudbuild.yaml the same as everything else in test/images?

@spiffxp
Copy link
Member

spiffxp commented Jul 23, 2021 

$ make all-container WHAT=conformance
./image-util.sh build conformance "docker"
./image-util.sh: line 104: conformance/VERSION: No such file or directory
make: *** [all-container] Error 1

@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021 •
edited

Or put another way, can it be built via https://github.com/kubernetes/kubernetes/blob/master/test/images/cloudbuild.yaml the same as everything else in test/images?

since this intends to produce a unique image per commit at HEAD, I don't think it follows the same pattern as test images which only bump version occasionally

@liggitt liggitt mentioned this pull request Jul 23, 2021
Merged
@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021

+1 from me! for 1.23 we'll need to fix up references outside this repo when the time comes - https://cs.k8s.io/?q=cluster%2Fimages%2Fconformance&i=nope&files=&excludeFiles=&repos=kubernetes/test-infra

opened kubernetes/test-infra#23000 to do this conditionally based on what dirs exist in the branch being tested

@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021

pull-kubernetes-conformance-image-test failure is expected until kubernetes/test-infra#23000

@liggitt liggitt added this to the v1.23 milestone Jul 23, 2021
@spiffxp
Copy link
Member

spiffxp commented Jul 23, 2021

since this intends to produce a unique image per commit at HEAD, I don't think it follows the same pattern as test images which only bump version occasionally

Can we put this someplace other than test/images then? This will break make invocations without WHAT=

How about test/conformance/image?

@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021

Can we put this someplace other than test/images then? This will break make invocations without WHAT=

How about test/conformance/image?

works for me

@k8s-ci-robot k8s-ci-robot added area/conformance Issues or PRs related to kubernetes conformance tests sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. labels Jul 23, 2021
@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021

How about test/conformance/image?

done

@spiffxp
Copy link
Member

spiffxp commented Jul 23, 2021

/skip pull-kubernetes-conformance-image-test

spiffxp
spiffxp approved these changes Jul 23, 2021
View reviewed changes
Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 23, 2021
@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021

/skip pull-kubernetes-conformance-image-test

alternatively, we could merge kubernetes/test-infra#23000 and make sure the test passes

@spiffxp
Copy link
Member

spiffxp commented Jul 23, 2021

alternatively, we could merge kubernetes/test-infra#23000 and make sure the test passes

I missed that you had opened that, approved

BenTheElder
BenTheElder approved these changes Jul 23, 2021
View reviewed changes
Copy link
Member

@BenTheElder BenTheElder left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve
+1 to a dir other than test/images

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, liggitt, spiffxp

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

@liggitt
Copy link
Member Author

liggitt commented Jul 23, 2021

/test pull-kubernetes-conformance-image-test

@liggitt
Copy link
Member Author

liggitt commented Jul 26, 2021

pull-kubernetes-conformance-image-test is happy, this should be good to go once 1.23 is open

@k8s-ci-robot k8s-ci-robot merged commit 58cde6c into kubernetes:master Aug 5, 2021
@liggitt liggitt deleted the move-conformance branch August 5, 2021 15:39
@wilsonehusin wilsonehusin mentioned this pull request Sep 21, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spiffxp spiffxp spiffxp approved these changes

@BenTheElder BenTheElder BenTheElder approved these changes

@dims dims Awaiting requested review from dims

Assignees

@dims dims

@spiffxp spiffxp

@BenTheElder BenTheElder

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/code-organization Issues or PRs related to kubernetes code organization area/conformance Issues or PRs related to kubernetes conformance tests area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

Move conformance source out of cluster/images/conformance
5 participants
@liggitt @k8s-ci-robot @dims @spiffxp @BenTheElder