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

Shuffle release branch jobs and add fork annotations #12516

Merged
merged 4 commits into from
May 7, 2019
Merged

Shuffle release branch jobs and add fork annotations #12516

merged 4 commits into from
May 7, 2019

Conversation

Katharine
Copy link
Member

This PR shuffles branch-specific jobs into per-release files, and adds annotations to their parent jobs so that config-forker can generate them.

It does not rename beta/stable1/stable2/stable3, but it does have the following renames, as discussed in #12443:

  • ci-kubernetes-gce-conformance -> ci-kubernetes-gce-conformance-latest: consistency with the child job names
  • ci-kubernetes-node-kubelet-beta-features -> ci-kubernetes-node-kubelet-features-beta: consistency with the usual suffixing strategy. The testgrid tab was actually already called this.
  • ci-kubernetes-build -> ci-kubernetes-build-fast: because it's different to all the other ci-kubernetes-build jobs.

This is going to be a conflict magnet so I'd appreciate getting this in pretty quickly!

/cc @krzyzacy @spiffxp @BenTheElder @fejta

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Katharine

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. area/config Issues or PRs related to code in /config area/testgrid sig/release Categorizes an issue or PR as relevant to SIG Release. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels May 7, 2019
@Katharine Katharine force-pushed the rearrange-forked-jobs branch from a80ce60 to 8eb4a33 Compare May 7, 2019 18:58
@spiffxp
Copy link
Member

spiffxp commented May 7, 2019

/cc @alejandrox1 @mariantalla
ref: #11977

@imkin
Copy link

imkin commented May 7, 2019

Its difficult to review if all the configs have moved successfully.

We should be ready to field the questions around finding the new jobs for those who will find them missing in their configs/test-grid.

I am not one of the cc'd reviewers here but this is lgtm to me.

@imkin imkin mentioned this pull request May 7, 2019
Closed
@spiffxp
Copy link
Member

spiffxp commented May 7, 2019

/lgtm
I would prefer to have the jobs live in kubernetes/sig-release/release-branch-jobs but let's get the merge conflicty part out of the way

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 7, 2019
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 3f2cdd7b5e8d9d7814a575d5ccc5f0162171ded9

@k8s-ci-robot k8s-ci-robot merged commit d9bafbc into kubernetes:master May 7, 2019
@k8s-ci-robot
Copy link
Contributor

@Katharine: Updated the job-config configmap in namespace default using the following files:

  • key generated-security-jobs.yaml using file config/jobs/kubernetes-security/generated-security-jobs.yaml
  • key 1.11.yaml using file config/jobs/kubernetes/release-branch-jobs/1.11.yaml
  • key 1.12.yaml using file config/jobs/kubernetes/release-branch-jobs/1.12.yaml
  • key 1.13.yaml using file config/jobs/kubernetes/release-branch-jobs/1.13.yaml
  • key 1.14.yaml using file config/jobs/kubernetes/release-branch-jobs/1.14.yaml
  • key kops-presubmits.yaml using file config/jobs/kubernetes/sig-aws/kops/kops-presubmits.yaml
  • key gce-conformance.yaml using file config/jobs/kubernetes/sig-gcp/gce-conformance.yaml
  • key sig-gcp-gpu-presubmit.yaml using file config/jobs/kubernetes/sig-gcp/gpu/sig-gcp-gpu-presubmit.yaml
  • key sig-gcp-gce-config.yaml using file config/jobs/kubernetes/sig-gcp/sig-gcp-gce-config.yaml
  • key sig-gcp-gke-config.yaml using file config/jobs/kubernetes/sig-gcp/sig-gcp-gke-config.yaml
  • key node-kubelet.yaml using file config/jobs/kubernetes/sig-node/node-kubelet.yaml
  • key sig-node-presubmit.yaml using file config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
  • key kubernetes-builds.yaml using file config/jobs/kubernetes/sig-release/kubernetes-builds.yaml
  • key sig-scalability-presubmit-jobs.yaml using file config/jobs/kubernetes/sig-scalability/sig-scalability-presubmit-jobs.yaml
  • key bazel-build-test.yaml using file config/jobs/kubernetes/sig-testing/bazel-build-test.yaml
  • key integration.yaml using file config/jobs/kubernetes/sig-testing/integration.yaml
  • key typecheck.yaml using file config/jobs/kubernetes/sig-testing/typecheck.yaml
  • key verify.yaml using file config/jobs/kubernetes/sig-testing/verify.yaml

In response to this:

This PR shuffles branch-specific jobs into per-release files, and adds annotations to their parent jobs so that config-forker can generate them.

It does not rename beta/stable1/stable2/stable3, but it does have the following renames, as discussed in #12443:

  • ci-kubernetes-gce-conformance -> ci-kubernetes-gce-conformance-latest: consistency with the child job names
  • ci-kubernetes-node-kubelet-beta-features -> ci-kubernetes-node-kubelet-features-beta: consistency with the usual suffixing strategy. The testgrid tab was actually already called this.
  • ci-kubernetes-build -> ci-kubernetes-build-fast: because it's different to all the other ci-kubernetes-build jobs.

This is going to be a conflict magnet so I'd appreciate getting this in pretty quickly!

/cc @krzyzacy @spiffxp @BenTheElder @fejta

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.

@spiffxp spiffxp mentioned this pull request May 7, 2019
Merged
@spiffxp
Copy link
Member

spiffxp commented May 10, 2019

ref: #11977

@nikhita nikhita mentioned this pull request May 14, 2019
Merged
@spiffxp spiffxp mentioned this pull request Jul 31, 2019
Closed
18 tasks
@justaugustus justaugustus mentioned this pull request Dec 9, 2019
Open
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BenTheElder BenTheElder Awaiting requested review from BenTheElder

@fejta fejta Awaiting requested review from fejta

@krzyzacy krzyzacy Awaiting requested review from krzyzacy

@spiffxp spiffxp Awaiting requested review from spiffxp

@alejandrox1 alejandrox1 Awaiting requested review from alejandrox1

@mariantalla mariantalla Awaiting requested review from mariantalla

Assignees

@spiffxp spiffxp

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/config Issues or PRs related to code in /config area/testgrid 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. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Katharine @k8s-ci-robot @spiffxp @imkin