Add CAPI jobs for main latest #33288

SD-13 · 2024-08-10T17:02:02Z

Fixes kubernetes-sigs/cluster-api#10955 to the PR description.

chrischdi · 2024-08-12T14:28:11Z

config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml

@@ -275,3 +275,61 @@ periodics:
    testgrid-tab-name: capi-e2e-conformance-ci-latest-main
    testgrid-alert-email: [email protected]
    testgrid-num-failures-to-alert: "4"
+- name: periodic-cluster-api-e2e-main-latest


Note: you should add the jobs to https://github.com/SD-13/k8s-test-infra/blob/e2e_main_job/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl and https://github.com/SD-13/k8s-test-infra/blob/e2e_main_job/config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl instead and use

TEST_INFRA_DIR=../../k8s.io/test-infra make generate-test-infra-prowjobs to generate this file 🙂 . (note: adjust the TEST_INFRA_DIR according to where the repo is for you.

SD-13 · 2024-08-12T17:20:10Z

@chrischdi Thanks for correcting me. I tried to reflect your suggestions, PTAL when you get time. Thanks!

sbueringer · 2024-08-19T17:21:43Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl

@@ -274,4 +274,61 @@ periodics:
    testgrid-tab-name: capi-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
    testgrid-alert-email: [email protected]
    testgrid-num-failures-to-alert: "4"
+- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}


Let's change this name so we end up with e.g. "pull-cluster-api-e2e-latestk8s-main" (similar for the periodic)

Suggested change

- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}

- name: periodic-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}

Suggested change

- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}

{{ if eq $.branch "main" }}

- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}

And further down at the end of the new job
{{ end }}

Added, thanks for clarifying that @chrischdi

sbueringer · 2024-08-19T17:22:04Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl

@@ -274,4 +274,61 @@ periodics:
    testgrid-tab-name: capi-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
    testgrid-alert-email: [email protected]
    testgrid-num-failures-to-alert: "4"


Let's add an if/else around it, so that it only gets generated for the main branch

sbueringer · 2024-08-19T17:24:52Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl

@@ -274,4 +274,61 @@ periodics:
    testgrid-tab-name: capi-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}


Let's rebase onto the latest commit on the master branch (so that the prowjob gen file is up-to-date)

sbueringer · 2024-08-19T17:29:41Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl

+          - name: GINKGO_SKIP
+            value: "\\[Conformance\\]"
+          - name: KUBERNETES_VERSION_MANAGEMENT
+            value: "ci/latest-1.31"


[After rebase]

Let's try to generate these values based on the prowjob gen file

I think we should be able to calculate these values the same way as we do it here: pull-cluster-api-e2e-upgrade-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}

KUBERNETES_VERSION_MANAGEMENT, KUBERNETES_VERSION. KUBERNETES_VERSION_UPGRADE_TO should be {{ index (index $.versions ((last $.config.Upgrades).To)) "k8sRelease" }}

KUBERNETES_VERSION_UPGRADE_FROM should be {{ index (index $.versions ((last $.config.Upgrades).From)) "k8sRelease" }}

sbueringer · 2024-08-19T17:31:48Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl

@@ -453,4 +453,61 @@ presubmits:
    annotations:
      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
      testgrid-tab-name: capi-pr-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
+  - name: periodic-cluster-api-upgrade-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}


Suggested change

- name: periodic-cluster-api-upgrade-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}

- name: pull-cluster-api-e2e-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}

Please compare for the suffix with the pull- job

sbueringer · 2024-08-19T17:32:32Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl

+    decorate: true
+    decoration_config:
+      timeout: 180m
+    path_alias: sigs.k8s.io/cluster-api


Let's move this down below branches (for easier diff with the regular e2e presubmit job)

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl

SD-13 · 2024-08-25T14:40:36Z

@chrischdi @sbueringer Please take another pass when you get time. Thanks!

sbueringer · 2024-08-26T08:18:08Z

@SD-13 We'll need another rebase because of: #33367

SD-13 · 2024-08-26T08:48:36Z

/retitle Add CAPI jobs for main latest
@sbueringer done!

sbueringer · 2024-08-26T08:52:39Z

Please add "Fixes kubernetes-sigs/cluster-api#10955" to the PR description

sbueringer

Thx! Last nits

sbueringer · 2024-08-26T08:59:39Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-periodics.yaml.tpl

@@ -275,3 +275,62 @@ periodics:
    testgrid-alert-email: [email protected]
    testgrid-num-failures-to-alert: "4"
 {{ end -}}
+{{ if eq $.branch "main" }}
+- name: pull-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}


Suggested change

- name: pull-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}

- name: periodic-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}

sbueringer · 2024-08-26T09:03:08Z

config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml

@@ -411,3 +411,55 @@ presubmits:
    annotations:
      testgrid-dashboards: sig-cluster-lifecycle-cluster-api
      testgrid-tab-name: capi-pr-e2e-conformance-ci-latest-main
+
+  - name: pull-cluster-api-e2e-latestk8s-1-31-1-32-main


Suggested change

- name: pull-cluster-api-e2e-latestk8s-1-31-1-32-main

- name: pull-cluster-api-e2e-latestk8s-main

We have to update the template so this looks like ^^

sbueringer · 2024-08-26T09:05:52Z

config/jobs/kubernetes-sigs/cluster-api/templates/cluster-api-presubmits.yaml.tpl

@@ -454,3 +454,56 @@ presubmits:
      testgrid-dashboards: sig-cluster-lifecycle-cluster-api{{ if eq $.branch "main" | not -}}{{ TrimPrefix $.branch "release" }}{{- end }}
      testgrid-tab-name: capi-pr-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}
 {{ end -}}
+{{ if eq $.branch "main" }}
+  - name: pull-cluster-api-e2e-latestk8s-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}


Suggested change

- name: pull-cluster-api-e2e-latestk8s-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}

- name: pull-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}

(See related comment in cluster-api-main-presubmits.yaml)

SD-13 · 2024-08-26T10:21:26Z

@sbueringer pushed the changed, PTAL. Thanks!

sbueringer · 2024-08-26T10:27:26Z

Thank you very much!

/lgtm
/assign @chrischdi
for a final review

chrischdi · 2024-08-28T09:50:37Z

/approve

k8s-ci-robot · 2024-08-28T09:50:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chrischdi, SD-13

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:

~~config/jobs/kubernetes-sigs/cluster-api/OWNERS~~ [chrischdi]

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

chrischdi · 2024-08-28T09:50:49Z

Thanks for working on this @SD-13 !

k8s-ci-robot · 2024-08-28T10:03:01Z

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

key cluster-api-main-periodics.yaml using file config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-periodics.yaml
key cluster-api-main-presubmits.yaml using file config/jobs/kubernetes-sigs/cluster-api/cluster-api-main-presubmits.yaml

In response to this:

Fixes kubernetes-sigs/cluster-api#10955 to the PR description.

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.

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 Aug 10, 2024

k8s-ci-robot requested review from neolit123 and vincepri August 10, 2024 17:02

SD-13 force-pushed the e2e_main_job branch from 29576b6 to 9190192 Compare August 10, 2024 17:03

SD-13 mentioned this pull request Aug 10, 2024

Add e2e test job for main branch that uses Kubernetes latest kubernetes-sigs/cluster-api#10955

Closed

chrischdi reviewed Aug 12, 2024

View reviewed changes

SD-13 force-pushed the e2e_main_job branch from 9190192 to 63990cf Compare August 12, 2024 17:18

sbueringer reviewed Aug 19, 2024

View reviewed changes

SD-13 force-pushed the e2e_main_job branch 3 times, most recently from 014cb91 to f8f9725 Compare August 25, 2024 14:03

SD-13 force-pushed the e2e_main_job branch from f8f9725 to eabba99 Compare August 26, 2024 08:47

k8s-ci-robot changed the title ~~WIP: Add CAPI jobs for main latest~~ Add CAPI jobs for main latest Aug 26, 2024

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 Aug 26, 2024

sbueringer reviewed Aug 26, 2024

View reviewed changes

add latest main jobs

5d47e08

SD-13 force-pushed the e2e_main_job branch from eabba99 to 5d47e08 Compare August 26, 2024 10:19

k8s-ci-robot assigned chrischdi and sbueringer Aug 26, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 26, 2024

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 28, 2024

k8s-ci-robot merged commit ecbe967 into kubernetes:master Aug 28, 2024
7 checks passed

SD-13 deleted the e2e_main_job branch August 28, 2024 16:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add CAPI jobs for main latest #33288

Add CAPI jobs for main latest #33288

SD-13 commented Aug 10, 2024 •

edited

Loading

chrischdi Aug 12, 2024

SD-13 commented Aug 12, 2024

sbueringer Aug 19, 2024

chrischdi Aug 23, 2024

chrischdi Aug 23, 2024

SD-13 Aug 25, 2024

sbueringer Aug 19, 2024

SD-13 Aug 25, 2024

sbueringer Aug 19, 2024

sbueringer Aug 19, 2024

SD-13 Aug 25, 2024

sbueringer Aug 19, 2024

SD-13 Aug 25, 2024

sbueringer Aug 19, 2024

SD-13 Aug 25, 2024

SD-13 commented Aug 25, 2024

sbueringer commented Aug 26, 2024

SD-13 commented Aug 26, 2024

sbueringer commented Aug 26, 2024

sbueringer left a comment

sbueringer Aug 26, 2024

SD-13 Aug 26, 2024

sbueringer Aug 26, 2024

SD-13 Aug 26, 2024

sbueringer Aug 26, 2024

SD-13 Aug 26, 2024

SD-13 commented Aug 26, 2024

sbueringer commented Aug 26, 2024

chrischdi commented Aug 28, 2024

k8s-ci-robot commented Aug 28, 2024

chrischdi commented Aug 28, 2024

k8s-ci-robot commented Aug 28, 2024

	- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}
	- name: periodic-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}

	- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}
	{{ if eq $.branch "main" }}
	- name: periodic-cluster-api-e2e-{{ ReplaceAll $.branch "." "-" }}

		@@ -274,4 +274,61 @@ periodics:
		testgrid-tab-name: capi-e2e-conformance-ci-latest-{{ ReplaceAll $.branch "." "-" }}

	- name: periodic-cluster-api-upgrade-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}
	- name: pull-cluster-api-e2e-{{ ReplaceAll (last $.config.Upgrades).From "." "-" }}-{{ ReplaceAll (last $.config.Upgrades).To "." "-" }}-{{ ReplaceAll $.branch "." "-" }}

	- name: pull-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}
	- name: periodic-cluster-api-e2e-latestk8s-{{ ReplaceAll $.branch "." "-" }}

	- name: pull-cluster-api-e2e-latestk8s-1-31-1-32-main
	- name: pull-cluster-api-e2e-latestk8s-main

Add CAPI jobs for main latest #33288

Add CAPI jobs for main latest #33288

Conversation

SD-13 commented Aug 10, 2024 • edited Loading

Choose a reason for hiding this comment

SD-13 commented Aug 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SD-13 commented Aug 25, 2024

sbueringer commented Aug 26, 2024

SD-13 commented Aug 26, 2024

sbueringer commented Aug 26, 2024

sbueringer left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

SD-13 commented Aug 26, 2024

sbueringer commented Aug 26, 2024

chrischdi commented Aug 28, 2024

k8s-ci-robot commented Aug 28, 2024

chrischdi commented Aug 28, 2024

k8s-ci-robot commented Aug 28, 2024

SD-13 commented Aug 10, 2024 •

edited

Loading