diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index da45dc65..8b8f0aed 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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