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

[WIP] releng: Add stable4 and remove beta generated jobs #18169

Closed

Conversation

justaugustus
Copy link
Member

@justaugustus justaugustus commented Jul 4, 2020

Part of kubernetes/sig-release#850.

(Needed ahead of this week's branch cut.)

  • Remove extraneous latest-{{.Version}}-cross markers

    latest-{{.Version}} are inherently cross builds, so having the
    latest-{{.Version}}-cross markers is redundant.

    (This commit matches another in releng: Publish fast builds to a separate subdirectory #18163, so it'll get rebased out of
    whichever PR lands last.)

  • Drop test config for beta jobs, add stable4 jobs

    beta markers shift depending on the stage in the release cycle and can
    end up being inaccurate without consistent care and feeding of the
    generated jobs.

    Here we remove the beta job configs (not the k8s-beta version marker;
    that'll happen in an upcoming commit) and establish a new stable4
    version config.

    This serves a few purposes:

    • beta releases are now cut from the main (master) branch, so the
      dev k8sVersions/nodeK8sVersions configs are now sufficient to
      describe the beta phase of the release cycle
    • now that we've expanded the support cycle for Kubernetes versions
      (from 1.19 on) to 12+ months, removing the previous jobs no longer
      falls neatly in line with the timing of the next branch cut. The
      stable4 job configs will now allow us to maintain generated jobs
      through the newly extended support cycle.
  • Regenerate jobs

  • Update dashboard group/tab references

cc: @kubernetes/release-engineering @kubernetes/wg-lts

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. area/config Issues or PRs related to code in /config area/jobs area/release-eng Issues or PRs related to the Release Engineering subproject 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 Jul 4, 2020
@k8s-ci-robot k8s-ci-robot requested review from feiskyer and yguo0905 July 4, 2020 09:48
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jul 4, 2020
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Jul 5, 2020
@justaugustus justaugustus force-pushed the 119-branches-test branch 3 times, most recently from 5fc5fd1 to 634450c Compare July 5, 2020 07:29
@justaugustus justaugustus changed the title [WIP] 119 branches test (remove beta markers / prepare release branch) releng: Prepare job configs for 1.19 release branch cut Jul 5, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 5, 2020
@justaugustus
Copy link
Member Author

Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

/lgtm

Copy link

@markjacksonfishing markjacksonfishing left a comment

Choose a reason for hiding this comment

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

/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 6, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: cpanato, hasheddan, justaugustus, markyjackson-taulia, saschagrunert
To complete the pull request process, please assign bentheelder
You can assign the PR to them by writing /assign @bentheelder in a comment when ready.

The full list of commands accepted by this bot can be found 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

@spiffxp
Copy link
Member

spiffxp commented Jul 7, 2020

/hold

now that we've expanded the support cycle for Kubernetes versions (from 1.19 on) to 12+ months, removing the previous jobs no longer falls neatly in line with the timing of the next branch cut. The stable4 job configs will now allow us to maintain generated jobs through the newly extended support cycle.

I have not seen agreement / consensus that 1.16 is getting retroactive 12+ month support.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 7, 2020
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.

I think this leaves things in a state where forked / manually authored jobs (ie: anything current on the sig-release-1.18-blocking/informing dashboards) end in "beta" and the generated jobs end in "stable1" and that seems really confusing to me

@@ -54,7 +54,7 @@ def delete_dead_branch(branch_path, current_version):


def rotate_files(rotator_bin, branch_path, current_version):
suffixes = ['beta', 'stable1', 'stable2', 'stable3']
suffixes = ['stable1', 'stable2', 'stable3', 'stable4']
Copy link
Member

Choose a reason for hiding this comment

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

making this change without making a corresponding change to all of the non-generated jobs with the word 'beta` in them is confusing

@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2020
@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 12, 2020
latest-{{.Version}} are inherently cross builds, so having the
latest-{{.Version}}-cross markers is redundant.

(This commit matches another in 18163, so it'll get rebased out of
whichever PR lands last.)

Signed-off-by: Stephen Augustus <[email protected]>
beta markers shift depending on the stage in the release cycle and can
end up being inaccurate without consistent care and feeding of the
generated jobs.

Here we remove the beta job configs (not the k8s-beta version marker;
that'll happen in an upcoming commit) and establish a new 'stable4'
version config.

This serves a few purposes:
- beta releases are now cut from the main ('master') branch, so the
  'dev' 'k8sVersions'/'nodeK8sVersions' configs are now sufficient to
  describe the beta phase of the release cycle
- now that we've expanded the support cycle for Kubernetes versions
  (from 1.19 on) to 12+ months, removing the previous jobs no longer
  falls neatly in line with the timing of the next branch cut. The
  'stable4' job configs will now allow us to maintain generated jobs
  through the newly extended support cycle.

Signed-off-by: Stephen Augustus <[email protected]>
Signed-off-by: Stephen Augustus <[email protected]>
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 13, 2020
@justaugustus justaugustus changed the title releng: Prepare job configs for 1.19 release branch cut [WIP] releng: Prepare job configs for 1.19 release branch cut Jul 13, 2020
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jul 13, 2020
@justaugustus justaugustus changed the title [WIP] releng: Prepare job configs for 1.19 release branch cut [WIP] releng: Add stable4 and remove beta generated jobs Jul 13, 2020
@justaugustus
Copy link
Member Author

Moving this back to WIP, but rebased, so the PR doesn't fall too far behind.

I have not seen agreement / consensus that 1.16 is getting retroactive 12+ month support.

@spiffxp -- While that's true, we have agreed on extended support for 1.19+, which means our test config needs to support that possibility, irrespective of any decisions for retroactively extending support for older branches.

Discussion is happening here and we need to close the loop on that: https://kubernetes.slack.com/archives/CDTMPM75W/p1594146739077400

@k8s-ci-robot
Copy link
Contributor

@justaugustus: PR needs rebase.

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 the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 14, 2020
@k8s-ci-robot
Copy link
Contributor

@justaugustus: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-test-infra-gubernator 7546a75 link /test pull-test-infra-gubernator

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@justaugustus
Copy link
Member Author

I'll think through this after the break.
/close

@k8s-ci-robot
Copy link
Contributor

@justaugustus: Closed this PR.

In response to this:

I'll think through this after the break.
/close

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/config Issues or PRs related to code in /config area/jobs area/release-eng Issues or PRs related to the Release Engineering subproject area/testgrid cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. 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/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants