Skip to content

Commit

Permalink
🌱 Add jobs for CAPI release 1.9 and remove 1.6 jobs
Browse files Browse the repository at this point in the history
  • Loading branch information
@cahillsf
cahillsf committed Nov 19, 2024
1 parent 51987a8 commit 3be8336
Show file tree
Hide file tree
Showing 5 changed files with 321 additions and 147 deletions.
36 changes: 18 additions & 18 deletions config/jobs/kubernetes-sigs/cluster-api/cluster-api-prowjob-gen.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,13 @@ prow_ignored:
to: "1.31"
- from: "1.31"
to: "1.32"
release-1.8:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.30"
release-1.9:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31"
interval: "4h"
upgradesInterval: "24h"
kubernetesVersionManagement: "v1.27.13"
kubebuilderEnvtestKubernetesVersion: "1.27.1"
kubernetesVersionManagement: "v1.28.9"
kubebuilderEnvtestKubernetesVersion: "1.28.3"
upgrades:
- from: "1.25"
to: "1.26"
- from: "1.26"
to: "1.27"
- from: "1.27"
Expand All @@ -69,15 +67,15 @@ prow_ignored:
to: "1.30"
- from: "1.30"
to: "1.31"
release-1.7:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.29"
- from: "1.31"
to: "1.32"
release-1.8:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.30"
interval: "4h"
upgradesInterval: "24h"
kubernetesVersionManagement: "v1.26.15"
kubebuilderEnvtestKubernetesVersion: "1.26.1"
kubernetesVersionManagement: "v1.27.13"
kubebuilderEnvtestKubernetesVersion: "1.27.1"
upgrades:
- from: "1.24"
to: "1.25"
- from: "1.25"
to: "1.26"
- from: "1.26"
Expand All @@ -88,15 +86,15 @@ prow_ignored:
to: "1.29"
- from: "1.29"
to: "1.30"
release-1.6:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.28"
- from: "1.30"
to: "1.31"
release-1.7:
testImage: "gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.29"
interval: "4h"
upgradesInterval: "24h"
kubernetesVersionManagement: "v1.25.11"
kubebuilderEnvtestKubernetesVersion: "1.25.0"
kubernetesVersionManagement: "v1.26.15"
kubebuilderEnvtestKubernetesVersion: "1.26.1"
upgrades:
- from: "1.23"
to: "1.24"
- from: "1.24"
to: "1.25"
- from: "1.25"
Expand All @@ -107,6 +105,8 @@ prow_ignored:
to: "1.28"
- from: "1.28"
to: "1.29"
- from: "1.29"
to: "1.30"

# The generator will run each template per branch and use a filename friendly
# branch variable to format the target filename.
Expand Down
108 changes: 54 additions & 54 deletions ...r-api-release-1-6-periodics-upgrades.yaml → ...r-api-release-1-9-periodics-upgrades.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Code generated by cluster-api's prowjob-gen. DO NOT EDIT.
periodics:
- name: periodic-cluster-api-e2e-upgrade-1-23-1-24-release-1-6
- name: periodic-cluster-api-e2e-upgrade-1-26-1-27-release-1-9
cluster: eks-prow-build-cluster
interval: 24h
decorate: true
Expand All @@ -16,29 +16,29 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: release-1.6
base_ref: release-1.9
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.28
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: ALWAYS_BUILD_KIND_IMAGES
value: "true"
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.23"
value: "stable-1.26"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.24"
value: "stable-1.27"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.3-0"
value: "3.5.6-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.8.6"
value: "v1.9.3"
- name: GINKGO_FOCUS
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
Expand All @@ -52,12 +52,12 @@ periodics:
cpu: 6000m
memory: 6Gi
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.6
testgrid-tab-name: capi-e2e-release-1-6-1-23-1-24
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.9
testgrid-tab-name: capi-e2e-release-1-9-1-26-1-27
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-upgrade-1-24-1-25-release-1-6
- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-release-1-9
cluster: eks-prow-build-cluster
interval: 24h
decorate: true
Expand All @@ -73,29 +73,29 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: release-1.6
base_ref: release-1.9
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.28
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: ALWAYS_BUILD_KIND_IMAGES
value: "true"
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.24"
value: "stable-1.27"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.25"
value: "stable-1.28"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.4-0"
value: "3.5.9-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
value: "v1.10.1"
- name: GINKGO_FOCUS
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
Expand All @@ -109,12 +109,12 @@ periodics:
cpu: 6000m
memory: 6Gi
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.6
testgrid-tab-name: capi-e2e-release-1-6-1-24-1-25
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.9
testgrid-tab-name: capi-e2e-release-1-9-1-27-1-28
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-upgrade-1-25-1-26-release-1-6
- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-release-1-9
cluster: eks-prow-build-cluster
interval: 24h
decorate: true
Expand All @@ -130,29 +130,29 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: release-1.6
base_ref: release-1.9
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.28
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: ALWAYS_BUILD_KIND_IMAGES
value: "true"
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.25"
value: "stable-1.28"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.26"
value: "stable-1.29"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.6-0"
value: "3.5.10-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
value: "v1.11.1"
- name: GINKGO_FOCUS
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
Expand All @@ -166,12 +166,12 @@ periodics:
cpu: 6000m
memory: 6Gi
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.6
testgrid-tab-name: capi-e2e-release-1-6-1-25-1-26
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.9
testgrid-tab-name: capi-e2e-release-1-9-1-28-1-29
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-upgrade-1-26-1-27-release-1-6
- name: periodic-cluster-api-e2e-upgrade-1-29-1-30-release-1-9
cluster: eks-prow-build-cluster
interval: 24h
decorate: true
Expand All @@ -187,29 +187,29 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: release-1.6
base_ref: release-1.9
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.28
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: ALWAYS_BUILD_KIND_IMAGES
value: "true"
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.26"
value: "stable-1.29"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.27"
value: "stable-1.30"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.6-0"
value: "3.5.12-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.9.3"
value: "v1.11.1"
- name: GINKGO_FOCUS
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
Expand All @@ -223,12 +223,12 @@ periodics:
cpu: 6000m
memory: 6Gi
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.6
testgrid-tab-name: capi-e2e-release-1-6-1-26-1-27
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.9
testgrid-tab-name: capi-e2e-release-1-9-1-29-1-30
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-upgrade-1-27-1-28-release-1-6
- name: periodic-cluster-api-e2e-upgrade-1-30-1-31-release-1-9
cluster: eks-prow-build-cluster
interval: 24h
decorate: true
Expand All @@ -244,29 +244,29 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: release-1.6
base_ref: release-1.9
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.28
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: ALWAYS_BUILD_KIND_IMAGES
value: "true"
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.27"
value: "stable-1.30"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.28"
value: "stable-1.31"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.9-0"
value: "3.5.15-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.10.1"
value: "v1.11.1"
- name: GINKGO_FOCUS
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
Expand All @@ -280,12 +280,12 @@ periodics:
cpu: 6000m
memory: 6Gi
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.6
testgrid-tab-name: capi-e2e-release-1-6-1-27-1-28
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.9
testgrid-tab-name: capi-e2e-release-1-9-1-30-1-31
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"

- name: periodic-cluster-api-e2e-upgrade-1-28-1-29-release-1-6
- name: periodic-cluster-api-e2e-upgrade-1-31-1-32-release-1-9
cluster: eks-prow-build-cluster
interval: 24h
decorate: true
Expand All @@ -301,29 +301,29 @@ periodics:
extra_refs:
- org: kubernetes-sigs
repo: cluster-api
base_ref: release-1.6
base_ref: release-1.9
path_alias: sigs.k8s.io/cluster-api
- org: kubernetes
repo: kubernetes
base_ref: master
path_alias: k8s.io/kubernetes
spec:
containers:
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-d3a4913879-1.28
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31
args:
- runner.sh
- "./scripts/ci-e2e.sh"
env:
- name: ALWAYS_BUILD_KIND_IMAGES
value: "true"
- name: KUBERNETES_VERSION_UPGRADE_FROM
value: "stable-1.28"
value: "stable-1.31"
- name: KUBERNETES_VERSION_UPGRADE_TO
value: "stable-1.29"
value: "ci/latest-1.32"
- name: ETCD_VERSION_UPGRADE_TO
value: "3.5.10-0"
value: "3.5.15-0"
- name: COREDNS_VERSION_UPGRADE_TO
value: "v1.11.1"
value: "v1.11.3"
- name: GINKGO_FOCUS
value: "\\[Conformance\\] \\[K8s-Upgrade\\]"
# we need privileged mode in order to do docker in docker
Expand All @@ -337,7 +337,7 @@ periodics:
cpu: 6000m
memory: 6Gi
annotations:
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.6
testgrid-tab-name: capi-e2e-release-1-6-1-28-1-29
testgrid-dashboards: sig-cluster-lifecycle-cluster-api-1.9
testgrid-tab-name: capi-e2e-release-1-9-1-31-1-32
testgrid-alert-email: [email protected]
testgrid-num-failures-to-alert: "4"
Loading

0 comments on commit 3be8336

Please sign in to comment.