Skip to content

Revert "add skip_cloning to periodics which don't need source code" + "add extra_refs to every periodic job that doesn't have it"#37042

Merged
k8s-ci-robot merged 1 commit into
kubernetes:masterfrom
pohly:revert-extra-refs
May 20, 2026
Merged

Revert "add skip_cloning to periodics which don't need source code" + "add extra_refs to every periodic job that doesn't have it"#37042
k8s-ci-robot merged 1 commit into
kubernetes:masterfrom
pohly:revert-extra-refs

Conversation

@pohly
Copy link
Copy Markdown
Contributor

@pohly pohly commented May 15, 2026 •
edited
Loading

This reverts commits

  • 0712a63 "add extra_refs to every periodic job that doesn't have it"
  • 37c0d10 "add skip_cloning to periodics which don't need source code"

Adding extra_refs was meant to add information about the branch and repo to the Pod labels. But that has side effects:

  • Causes extra work in all jobs for checking out source code.
  • Causes testgrid to show the checked out source code revision, which is not necessarily the same as the code under test.

The second commit avoided the overhead, but then testgrid started showing e.g. "master" instead of some revision. Ultimately the right approach is to not use extra_ref (this PR) and add labels differently (in some future PR).

In addition to the reverts above, some manual cleanup was also needed, like removing the TestReposBeingSet test.

/assign @BenTheElder
/cc @upodroid

@k8s-ci-robot k8s-ci-robot requested a review from upodroid May 15, 2026 16:17
@k8s-ci-robot k8s-ci-robot added area/config Issues or PRs related to code in /config size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. area/conformance Issues or PRs related to kubernetes conformance tests area/jobs area/provider/aws Issues or PRs related to aws provider area/provider/gcp Issues or PRs related to gcp provider area/release-eng Issues or PRs related to the Release Engineering subproject sig/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. labels May 15, 2026
@k8s-ci-robot k8s-ci-robot added sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels May 15, 2026
@pohly pohly force-pushed the revert-extra-refs branch 2 times, most recently from d65784d to ef80bbc Compare May 15, 2026 19:02
@pohly
Revert "add skip_cloning to periodics which don't need source code" +…
1b58cf3 
… "add extra_refs to every periodic job that doesn't have it"

This reverts commits
- 0712a63 "add extra_refs to every periodic job that doesn't have it"
- 37c0d10 "add skip_cloning to periodics which don't need source code"

Adding extra_refs was meant to add information about the branch and repo to the
Pod labels. But that has side effects:
- Causes extra work in all jobs for checking out source code.
- Causes testgrid to show the checked out source code revision,
  which is not necessarily the same as the code under test.

The second commit avoided the overhead, but then testgrid started showing
e.g. "master" instead of some revision. Ultimately the right approach is to not
use extra_ref (this PR) and add labels differently (in some future PR).

In addition to the reverts above, some manual cleanup was also needed, like
removing the TestReposBeingSet test.
@pohly pohly force-pushed the revert-extra-refs branch from ef80bbc to 1b58cf3 Compare May 15, 2026 19:18
@pohly pohly changed the title Revert "make: fix prepare-release-branch when default shell is not bash" + "add extra_refs to every periodic job that doesn't have it" Revert "add skip_cloning to periodics which don't need source code" + "add extra_refs to every periodic job that doesn't have it" May 15, 2026
@BenTheElder
Copy link
Copy Markdown
Member

BenTheElder commented May 19, 2026

/lgtm
/approve

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

pohly commented May 19, 2026

/assign @upodroid

upodroid
upodroid approved these changes May 20, 2026
View reviewed changes
Copy link
Copy Markdown
Member

@upodroid upodroid left a comment

Choose a reason for hiding this comment

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

Let's revert and figure it out

Also, the bad commit metadata in prow should be handled by kubetest, it should have written the marker it used or the ref checked out by prow.

@github-project-automation github-project-automation Bot moved this from Triage to PRs - Needs Approver in SIG Node CI/Test Board May 20, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 20, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: BenTheElder, pohly, upodroid

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

The pull request process is described here

Details 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 May 20, 2026
@BenTheElder
Copy link
Copy Markdown
Member

BenTheElder commented May 20, 2026

I think what we can do is set annotations / labels directly in the prow spec in the next iteration.

@k8s-ci-robot k8s-ci-robot merged commit d8b347a into kubernetes:master May 20, 2026
6 checks passed
@github-project-automation github-project-automation Bot moved this from PRs - Needs Approver to Done in SIG Node CI/Test Board May 20, 2026
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented May 20, 2026

@pohly: Updated the job-config configmap in namespace default at cluster test-infra-trusted using the following files:

  • key conformance-gate.yaml using file config/jobs/kubernetes/sig-arch/conformance-gate.yaml
  • key sig-autoscaling-config.yaml using file config/jobs/kubernetes/sig-autoscaling/sig-autoscaling-config.yaml
  • key sig-cli-config.yaml using file config/jobs/kubernetes/sig-cli/sig-cli-config.yaml
  • key ec2-e2e.yaml using file config/jobs/kubernetes/sig-cloud-provider/aws/ec2-e2e.yaml
  • key gcp-gce.yaml using file config/jobs/kubernetes/sig-cloud-provider/gcp/gcp-gce.yaml
  • key periodics.yaml using file config/jobs/kubernetes/sig-k8s-infra/periodics.yaml
  • key releng-trusted.yaml using file config/jobs/kubernetes/sig-k8s-infra/trusted/releng/releng-trusted.yaml
  • key sig-contribex-k8s-triage-robot.yaml using file config/jobs/kubernetes/sig-k8s-infra/trusted/sig-contribex-k8s-triage-robot.yaml
  • key sig-contribex-triage-robot-retester.yaml using file config/jobs/kubernetes/sig-k8s-infra/trusted/sig-contribex-triage-robot-retester.yaml
  • key sig-testing-label-sync.yaml using file config/jobs/kubernetes/sig-k8s-infra/trusted/sig-testing-label-sync.yaml
  • key ingress-gce-e2e.yaml using file config/jobs/kubernetes/sig-network/ingress-gce-e2e.yaml
  • key sig-network-gce.yaml using file config/jobs/kubernetes/sig-network/sig-network-gce.yaml
  • key containerd.yaml using file config/jobs/kubernetes/sig-node/containerd.yaml
  • key dra-ci.yaml using file config/jobs/kubernetes/sig-node/dra-ci.yaml
  • key 1.33.yaml using file config/jobs/kubernetes/sig-release/release-branch-jobs/1.33.yaml
  • key 1.34.yaml using file config/jobs/kubernetes/sig-release/release-branch-jobs/1.34.yaml
  • key 1.35.yaml using file config/jobs/kubernetes/sig-release/release-branch-jobs/1.35.yaml
  • key 1.36.yaml using file config/jobs/kubernetes/sig-release/release-branch-jobs/1.36.yaml
  • key sig-scalability-periodic-ec2.yaml using file config/jobs/kubernetes/sig-scalability/sig-scalability-periodic-ec2.yaml
  • key sig-scalability-release-blocking-jobs.yaml using file config/jobs/kubernetes/sig-scalability/sig-scalability-release-blocking-jobs.yaml
  • key sig-storage-gce-config.yaml using file config/jobs/kubernetes/sig-storage/sig-storage-gce-config.yaml
  • key kubetest-canaries.yaml using file config/jobs/kubernetes/sig-testing/kubetest-canaries.yaml
  • key local-e2e.yaml using file config/jobs/kubernetes/sig-testing/local-e2e.yaml
  • key janitors.yaml using file config/jobs/kubernetes/test-infra/janitors.yaml
Details

In response to this:

This reverts commits

  • 0712a63 "add extra_refs to every periodic job that doesn't have it"
  • 37c0d10 "add skip_cloning to periodics which don't need source code"

Adding extra_refs was meant to add information about the branch and repo to the Pod labels. But that has side effects:

  • Causes extra work in all jobs for checking out source code.
  • Causes testgrid to show the checked out source code revision, which is not necessarily the same as the code under test.

The second commit avoided the overhead, but then testgrid started showing e.g. "master" instead of some revision. Ultimately the right approach is to not use extra_ref (this PR) and add labels differently (in some future PR).

In addition to the reverts above, some manual cleanup was also needed, like removing the TestReposBeingSet test.

/assign @BenTheElder
/cc @upodroid

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-sigs/prow repository.

@pohly
Copy link
Copy Markdown
Contributor Author

pohly commented May 20, 2026

Also, the bad commit metadata in prow should be handled by kubetest, it should have written the marker it used or the ref checked out by prow.

The metadata in the job was correct, it just involved two different operations and those didn't (and couldn't) use the same revision (checking our master vs. downloading the latest release archives).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@upodroid upodroid upodroid approved these changes

Assignees

@BenTheElder BenTheElder

@upodroid upodroid

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/conformance Issues or PRs related to kubernetes conformance tests area/jobs area/provider/aws Issues or PRs related to aws provider area/provider/gcp Issues or PRs related to gcp provider area/release-eng Issues or PRs related to the Release Engineering subproject 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/architecture Categorizes an issue or PR as relevant to SIG Architecture. sig/cli Categorizes an issue or PR as relevant to SIG CLI. sig/cloud-provider Categorizes an issue or PR as relevant to SIG Cloud Provider. sig/contributor-experience Categorizes an issue or PR as relevant to SIG Contributor Experience. sig/k8s-infra Categorizes an issue or PR as relevant to SIG K8s Infra. sig/network Categorizes an issue or PR as relevant to SIG Network. sig/node Categorizes an issue or PR as relevant to SIG Node. sig/release Categorizes an issue or PR as relevant to SIG Release. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. sig/storage Categorizes an issue or PR as relevant to SIG Storage. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.

Projects

SIG Node CI/Test Board
Status: Done

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@pohly @BenTheElder @k8s-ci-robot @upodroid