Include 1.29 and drop 1.26 in CI (#187)
* Update images to drop 1.26 and include 1.29 * Drop 1.26 and include 1.29 in tests
This commit is contained in:
Matt Pryor
GitHub
parent
1830e7909d
commit
fe462d9456
18
.github/workflows/ensure-capi-images.yaml
vendored
18
.github/workflows/ensure-capi-images.yaml
vendored
@ -7,10 +7,6 @@ on:
|
||||
description: The Git ref under test.
|
||||
required: true
|
||||
outputs:
|
||||
kube-1-26-image:
|
||||
value: ${{ jobs.produce_outputs.outputs.kube-1-26-image }}
|
||||
kube-1-26-version:
|
||||
value: ${{ jobs.produce_outputs.outputs.kube-1-26-version }}
|
||||
kube-1-27-image:
|
||||
value: ${{ jobs.produce_outputs.outputs.kube-1-27-image }}
|
||||
kube-1-27-version:
|
||||
@ -19,6 +15,10 @@ on:
|
||||
value: ${{ jobs.produce_outputs.outputs.kube-1-28-image }}
|
||||
kube-1-28-version:
|
||||
value: ${{ jobs.produce_outputs.outputs.kube-1-28-version }}
|
||||
kube-1-29-image:
|
||||
value: ${{ jobs.produce_outputs.outputs.kube-1-29-image }}
|
||||
kube-1-29-version:
|
||||
value: ${{ jobs.produce_outputs.outputs.kube-1-29-version }}
|
||||
|
||||
jobs:
|
||||
image_manifest:
|
||||
@ -45,14 +45,14 @@ jobs:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- name: kube-1-26
|
||||
image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-26-jammy }}
|
||||
skip: ${{ github.event.pull_request.draft }}
|
||||
- name: kube-1-27
|
||||
image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-27-jammy }}
|
||||
skip: ${{ github.event.pull_request.draft }}
|
||||
- name: kube-1-28
|
||||
image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-28-jammy }}
|
||||
skip: ${{ github.event.pull_request.draft }}
|
||||
- name: kube-1-29
|
||||
image: ${{ fromJSON(needs.image_manifest.outputs.manifest).kubernetes-1-29-jammy }}
|
||||
skip: false
|
||||
steps:
|
||||
- name: Checkout
|
||||
@ -101,12 +101,12 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
needs: [ensure_image]
|
||||
outputs:
|
||||
kube-1-26-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-26 }}
|
||||
kube-1-26-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-26 }}
|
||||
kube-1-27-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-27 }}
|
||||
kube-1-27-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-27 }}
|
||||
kube-1-28-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-28 }}
|
||||
kube-1-28-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-28 }}
|
||||
kube-1-29-image: ${{ fromJSON(steps.matrix-outputs.outputs.result).image-id.kube-1-29 }}
|
||||
kube-1-29-version: ${{ fromJSON(steps.matrix-outputs.outputs.result).kube-version.kube-1-29 }}
|
||||
steps:
|
||||
- name: Read matrix outputs
|
||||
id: matrix-outputs
|
||||
|
||||
34
.github/workflows/test.yaml
vendored
34
.github/workflows/test.yaml
vendored
@ -78,16 +78,16 @@ jobs:
|
||||
tags: capi-helm-chart-ci
|
||||
if: ${{ !inputs.tests-full }}
|
||||
|
||||
- name: Test clean Kubernetes 1.28 deployment
|
||||
- name: Test clean Kubernetes 1.29 deployment
|
||||
uses: ./.github/actions/upgrade-and-test
|
||||
with:
|
||||
name: ci-${{ github.run_id }}-${{ github.job }}
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-28-image }}
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-29-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-29-image }}
|
||||
sonobuoy-mode: ${{ inputs.tests-full && 'certified-conformance' || 'quick' }}
|
||||
sonobuoy-upload: ${{ inputs.tests-full && 'yes' || 'no' }}
|
||||
|
||||
- name: Delete Kubernetes 1.28 deployment
|
||||
- name: Delete Kubernetes 1.29 deployment
|
||||
run: helm delete ci-${{ github.run_id }}-${{ github.job }} --wait
|
||||
if: ${{ always() }}
|
||||
|
||||
@ -145,14 +145,7 @@ jobs:
|
||||
machineFlavor: ${{ secrets.NODE_GROUP_FLAVOR }}
|
||||
machineCount: 2
|
||||
|
||||
- name: Deploy Kubernetes 1.26 for Kubernetes upgrade test
|
||||
uses: ./.github/actions/upgrade-and-test
|
||||
with:
|
||||
name: ci-${{ github.run_id }}-${{ github.job }}
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-26-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-26-image }}
|
||||
|
||||
- name: Upgrade to Kubernetes 1.27
|
||||
- name: Deploy Kubernetes 1.27 for Kubernetes upgrade test
|
||||
uses: ./.github/actions/upgrade-and-test
|
||||
with:
|
||||
name: ci-${{ github.run_id }}-${{ github.job }}
|
||||
@ -166,6 +159,13 @@ jobs:
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-28-image }}
|
||||
|
||||
- name: Upgrade to Kubernetes 1.29
|
||||
uses: ./.github/actions/upgrade-and-test
|
||||
with:
|
||||
name: ci-${{ github.run_id }}-${{ github.job }}
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-29-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-29-image }}
|
||||
|
||||
- name: Delete Kubernetes upgrade deployment
|
||||
run: helm delete ci-${{ github.run_id }}-${{ github.job }} --wait
|
||||
if: ${{ always() }}
|
||||
@ -261,10 +261,8 @@ jobs:
|
||||
with:
|
||||
chart-directory: latest-tag/charts/openstack-cluster
|
||||
name: ci-${{ github.run_id }}-${{ github.job }}
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-28-image }}
|
||||
# TODO(mkjpryor) remove this once calico csi-node-driver is fixed in a tagged version
|
||||
skip-workload-status: "yes"
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-29-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-29-image }}
|
||||
|
||||
- name: Update test environment with current dependencies
|
||||
uses: ./current/.github/actions/setup
|
||||
@ -276,8 +274,8 @@ jobs:
|
||||
with:
|
||||
chart-directory: current/charts/openstack-cluster
|
||||
name: ci-${{ github.run_id }}-${{ github.job }}
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-28-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-28-image }}
|
||||
kubernetes-version: ${{ fromJson(inputs.images).kube-1-29-version }}
|
||||
image-id: ${{ fromJson(inputs.images).kube-1-29-image }}
|
||||
|
||||
- name: Delete chart upgrade deployment
|
||||
run: helm delete ci-${{ github.run_id }}-${{ github.job }} --wait
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user