From 567cbc308b672554be663cd7c1d517152e948256 Mon Sep 17 00:00:00 2001 From: okozachenko1203 Date: Fri, 3 May 2024 00:11:57 +1000 Subject: [PATCH] update patch versions and add zuul CI jobs for new versions --- magnum_cluster_api/cmd/image_builder.py | 2 +- magnum_cluster_api/cmd/image_loader.py | 6 ++-- zuul.d/jobs-flatcar.yaml | 48 +++++++++++++++++++++---- zuul.d/jobs-rockylinux-8.yaml | 48 +++++++++++++++++++++---- zuul.d/jobs-rockylinux-9.yaml | 48 +++++++++++++++++++++---- zuul.d/jobs-ubuntu-2204.yaml | 48 +++++++++++++++++++++---- 6 files changed, 168 insertions(+), 32 deletions(-) diff --git a/magnum_cluster_api/cmd/image_builder.py b/magnum_cluster_api/cmd/image_builder.py index de8f3fa5..ce58da32 100644 --- a/magnum_cluster_api/cmd/image_builder.py +++ b/magnum_cluster_api/cmd/image_builder.py @@ -59,7 +59,7 @@ def validate_version(_, __, value): @click.option( "--version", show_default=True, - default="v1.27.8", + default="v1.29.4", callback=validate_version, help="Kubernetes version", ) diff --git a/magnum_cluster_api/cmd/image_loader.py b/magnum_cluster_api/cmd/image_loader.py index aa1c7b8f..0940299c 100644 --- a/magnum_cluster_api/cmd/image_loader.py +++ b/magnum_cluster_api/cmd/image_loader.py @@ -44,9 +44,9 @@ "v1.26.11", "v1.27.3", "v1.27.8", - "v1.27.12", - "v1.28.8", - "v1.29.3", + "v1.27.13", + "v1.28.9", + "v1.29.4", ] diff --git a/zuul.d/jobs-flatcar.yaml b/zuul.d/jobs-flatcar.yaml index fd64538c..4fc71349 100644 --- a/zuul.d/jobs-flatcar.yaml +++ b/zuul.d/jobs-flatcar.yaml @@ -14,23 +14,57 @@ image_os_distro: flatcar - job: - name: magnum-cluster-api-image-build-flatcar-v1.27.8 + name: magnum-cluster-api-image-build-flatcar-v1.27.13 parent: magnum-cluster-api-image-build-flatcar vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 - job: - name: magnum-cluster-api-sonobuoy-flatcar-v1.27.8 + name: magnum-cluster-api-sonobuoy-flatcar-v1.27.13 parent: magnum-cluster-api-sonobuoy-flatcar dependencies: - - name: magnum-cluster-api-image-build-flatcar-v1.27.8 + - name: magnum-cluster-api-image-build-flatcar-v1.27.13 soft: true vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 + +- job: + name: magnum-cluster-api-image-build-flatcar-v1.28.9 + parent: magnum-cluster-api-image-build-flatcar + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-sonobuoy-flatcar-v1.28.9 + parent: magnum-cluster-api-sonobuoy-flatcar + dependencies: + - name: magnum-cluster-api-image-build-flatcar-v1.28.9 + soft: true + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-image-build-flatcar-v1.29.4 + parent: magnum-cluster-api-image-build-flatcar + vars: + kube_tag: v1.29.4 + +- job: + name: magnum-cluster-api-sonobuoy-flatcar-v1.29.4 + parent: magnum-cluster-api-sonobuoy-flatcar + dependencies: + - name: magnum-cluster-api-image-build-flatcar-v1.29.4 + soft: true + vars: + kube_tag: v1.29.4 - project-template: name: magnum-cluster-api-flatcar check: jobs: - - magnum-cluster-api-image-build-flatcar-v1.27.8 - - magnum-cluster-api-sonobuoy-flatcar-v1.27.8 + - magnum-cluster-api-image-build-flatcar-v1.27.13 + - magnum-cluster-api-sonobuoy-flatcar-v1.27.13 + - magnum-cluster-api-image-build-flatcar-v1.28.9 + - magnum-cluster-api-sonobuoy-flatcar-v1.28.9 + - magnum-cluster-api-image-build-flatcar-v1.29.4 + - magnum-cluster-api-sonobuoy-flatcar-v1.29.4 diff --git a/zuul.d/jobs-rockylinux-8.yaml b/zuul.d/jobs-rockylinux-8.yaml index 5a78fd23..397d8072 100644 --- a/zuul.d/jobs-rockylinux-8.yaml +++ b/zuul.d/jobs-rockylinux-8.yaml @@ -14,23 +14,57 @@ image_os_distro: ubuntu - job: - name: magnum-cluster-api-image-build-rockylinux-8-v1.27.8 + name: magnum-cluster-api-image-build-rockylinux-8-v1.27.13 parent: magnum-cluster-api-image-build-rockylinux-8 vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 - job: - name: magnum-cluster-api-sonobuoy-rockylinux-8-v1.27.8 + name: magnum-cluster-api-sonobuoy-rockylinux-8-v1.27.13 parent: magnum-cluster-api-sonobuoy-rockylinux-8 dependencies: - - name: magnum-cluster-api-image-build-rockylinux-8-v1.27.8 + - name: magnum-cluster-api-image-build-rockylinux-8-v1.27.13 soft: true vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 + +- job: + name: magnum-cluster-api-image-build-rockylinux-8-v1.28.9 + parent: magnum-cluster-api-image-build-rockylinux-8 + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-sonobuoy-rockylinux-8-v1.28.9 + parent: magnum-cluster-api-sonobuoy-rockylinux-8 + dependencies: + - name: magnum-cluster-api-image-build-rockylinux-8-v1.28.9 + soft: true + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-image-build-rockylinux-8-v1.29.4 + parent: magnum-cluster-api-image-build-rockylinux-8 + vars: + kube_tag: v1.29.4 + +- job: + name: magnum-cluster-api-sonobuoy-rockylinux-8-v1.29.4 + parent: magnum-cluster-api-sonobuoy-rockylinux-8 + dependencies: + - name: magnum-cluster-api-image-build-rockylinux-8-v1.29.4 + soft: true + vars: + kube_tag: v1.29.4 - project-template: name: magnum-cluster-api-rockylinux-8 check: jobs: - - magnum-cluster-api-image-build-rockylinux-8-v1.27.8 - - magnum-cluster-api-sonobuoy-rockylinux-8-v1.27.8 + - magnum-cluster-api-image-build-rockylinux-8-v1.27.13 + - magnum-cluster-api-sonobuoy-rockylinux-8-v1.27.13 + - magnum-cluster-api-image-build-rockylinux-8-v1.28.9 + - magnum-cluster-api-sonobuoy-rockylinux-8-v1.28.9 + - magnum-cluster-api-image-build-rockylinux-8-v1.29.4 + - magnum-cluster-api-sonobuoy-rockylinux-8-v1.29.4 diff --git a/zuul.d/jobs-rockylinux-9.yaml b/zuul.d/jobs-rockylinux-9.yaml index 73e5b6f8..d1896e6e 100644 --- a/zuul.d/jobs-rockylinux-9.yaml +++ b/zuul.d/jobs-rockylinux-9.yaml @@ -14,23 +14,57 @@ image_os_distro: ubuntu - job: - name: magnum-cluster-api-image-build-rockylinux-9-v1.27.8 + name: magnum-cluster-api-image-build-rockylinux-9-v1.27.13 parent: magnum-cluster-api-image-build-rockylinux-9 vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 - job: - name: magnum-cluster-api-sonobuoy-rockylinux-9-v1.27.8 + name: magnum-cluster-api-sonobuoy-rockylinux-9-v1.27.13 parent: magnum-cluster-api-sonobuoy-rockylinux-9 dependencies: - - name: magnum-cluster-api-image-build-rockylinux-9-v1.27.8 + - name: magnum-cluster-api-image-build-rockylinux-9-v1.27.13 soft: true vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 + +- job: + name: magnum-cluster-api-image-build-rockylinux-9-v1.28.9 + parent: magnum-cluster-api-image-build-rockylinux-9 + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-sonobuoy-rockylinux-9-v1.28.9 + parent: magnum-cluster-api-sonobuoy-rockylinux-9 + dependencies: + - name: magnum-cluster-api-image-build-rockylinux-9-v1.28.9 + soft: true + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-image-build-rockylinux-9-v1.29.4 + parent: magnum-cluster-api-image-build-rockylinux-9 + vars: + kube_tag: v1.29.4 + +- job: + name: magnum-cluster-api-sonobuoy-rockylinux-9-v1.29.4 + parent: magnum-cluster-api-sonobuoy-rockylinux-9 + dependencies: + - name: magnum-cluster-api-image-build-rockylinux-9-v1.29.4 + soft: true + vars: + kube_tag: v1.29.4 - project-template: name: magnum-cluster-api-rockylinux-9 check: jobs: - - magnum-cluster-api-image-build-rockylinux-9-v1.27.8 - - magnum-cluster-api-sonobuoy-rockylinux-9-v1.27.8 + - magnum-cluster-api-image-build-rockylinux-9-v1.27.13 + - magnum-cluster-api-sonobuoy-rockylinux-9-v1.27.13 + - magnum-cluster-api-image-build-rockylinux-9-v1.28.9 + - magnum-cluster-api-sonobuoy-rockylinux-9-v1.28.9 + - magnum-cluster-api-image-build-rockylinux-9-v1.29.4 + - magnum-cluster-api-sonobuoy-rockylinux-9-v1.29.4 diff --git a/zuul.d/jobs-ubuntu-2204.yaml b/zuul.d/jobs-ubuntu-2204.yaml index cd333e64..5ebf788e 100644 --- a/zuul.d/jobs-ubuntu-2204.yaml +++ b/zuul.d/jobs-ubuntu-2204.yaml @@ -14,23 +14,57 @@ image_os_distro: ubuntu - job: - name: magnum-cluster-api-image-build-ubuntu-2204-v1.27.8 + name: magnum-cluster-api-image-build-ubuntu-2204-v1.27.13 parent: magnum-cluster-api-image-build-ubuntu-2204 vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 - job: - name: magnum-cluster-api-sonobuoy-ubuntu-2204-v1.27.8 + name: magnum-cluster-api-sonobuoy-ubuntu-2204-v1.27.13 parent: magnum-cluster-api-sonobuoy-ubuntu-2204 dependencies: - - name: magnum-cluster-api-image-build-ubuntu-2204-v1.27.8 + - name: magnum-cluster-api-image-build-ubuntu-2204-v1.27.13 soft: true vars: - kube_tag: v1.27.8 + kube_tag: v1.27.13 + +- job: + name: magnum-cluster-api-image-build-ubuntu-2204-v1.28.9 + parent: magnum-cluster-api-image-build-ubuntu-2204 + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-sonobuoy-ubuntu-2204-v1.28.9 + parent: magnum-cluster-api-sonobuoy-ubuntu-2204 + dependencies: + - name: magnum-cluster-api-image-build-ubuntu-2204-v1.28.9 + soft: true + vars: + kube_tag: v1.28.9 + +- job: + name: magnum-cluster-api-image-build-ubuntu-2204-v1.29.4 + parent: magnum-cluster-api-image-build-ubuntu-2204 + vars: + kube_tag: v1.29.4 + +- job: + name: magnum-cluster-api-sonobuoy-ubuntu-2204-v1.29.4 + parent: magnum-cluster-api-sonobuoy-ubuntu-2204 + dependencies: + - name: magnum-cluster-api-image-build-ubuntu-2204-v1.29.4 + soft: true + vars: + kube_tag: v1.29.4 - project-template: name: magnum-cluster-api-ubuntu-2204 check: jobs: - - magnum-cluster-api-image-build-ubuntu-2204-v1.27.8 - - magnum-cluster-api-sonobuoy-ubuntu-2204-v1.27.8 + - magnum-cluster-api-image-build-ubuntu-2204-v1.27.13 + - magnum-cluster-api-sonobuoy-ubuntu-2204-v1.27.13 + - magnum-cluster-api-image-build-ubuntu-2204-v1.28.9 + - magnum-cluster-api-sonobuoy-ubuntu-2204-v1.28.9 + - magnum-cluster-api-image-build-ubuntu-2204-v1.29.4 + - magnum-cluster-api-sonobuoy-ubuntu-2204-v1.29.4