From 1f1a212ecea63c1eec42aee52d4f99db24026855 Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Thu, 27 Oct 2022 08:29:59 +0200 Subject: [PATCH] ci: consider kubernetes 1.25 for tests As we have successful runs with kubernetes 1.25 Marking is as default for CI jobs and required for merging PR. Signed-off-by: Madhu Rajanna (cherry picked from commit f19805a40badd88ef000da2b7192092d9e725944) --- .github/workflows/pull-request-commentor.yaml | 21 +++++++++++++++++++ .mergify.yml | 12 +++++++++++ 2 files changed, 33 insertions(+) diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 9a10ef5fd..60a608575 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -29,6 +29,13 @@ jobs: body: | /test ci/centos/k8s-e2e-external-storage/1.24 + - name: Add comment to trigger external storage tests for Kubernetes 1.25 + uses: peter-evans/create-or-update-comment@v2 + with: + issue-number: ${{ github.event.pull_request.number }} + body: | + /test ci/centos/k8s-e2e-external-storage/1.25 + - name: Add comment to trigger helm E2E tests for Kubernetes 1.23 uses: peter-evans/create-or-update-comment@v2 with: @@ -43,6 +50,13 @@ jobs: body: | /test ci/centos/mini-e2e-helm/k8s-1.24 + - name: Add comment to trigger helm E2E tests for Kubernetes 1.25 + uses: peter-evans/create-or-update-comment@v2 + with: + issue-number: ${{ github.event.pull_request.number }} + body: | + /test ci/centos/mini-e2e-helm/k8s-1.25 + - name: Add comment to trigger E2E tests for Kubernetes 1.23 uses: peter-evans/create-or-update-comment@v2 with: @@ -57,6 +71,13 @@ jobs: body: | /test ci/centos/mini-e2e/k8s-1.24 + - name: Add comment to trigger E2E tests for Kubernetes 1.25 + uses: peter-evans/create-or-update-comment@v2 + with: + issue-number: ${{ github.event.pull_request.number }} + body: | + /test ci/centos/mini-e2e/k8s-1.25 + - name: Add comment to trigger cephfs upgrade tests uses: peter-evans/create-or-update-comment@v2 with: diff --git a/.mergify.yml b/.mergify.yml index 9b52deba6..8a3410780 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -28,10 +28,13 @@ queue_rules: - "status-success=lint-extras" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" + - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/mini-e2e-helm/k8s-1.23" - "status-success=ci/centos/mini-e2e-helm/k8s-1.24" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" + - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - and: @@ -74,10 +77,13 @@ pull_request_rules: - "status-success=lint-extras" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" + - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/mini-e2e-helm/k8s-1.23" - "status-success=ci/centos/mini-e2e-helm/k8s-1.24" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" + - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -110,10 +116,13 @@ pull_request_rules: - "status-success=lint-extras" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" + - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/mini-e2e-helm/k8s-1.23" - "status-success=ci/centos/mini-e2e-helm/k8s-1.24" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" + - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO" @@ -138,10 +147,13 @@ pull_request_rules: - "#changes-requested-reviews-by=0" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" + - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/mini-e2e-helm/k8s-1.23" - "status-success=ci/centos/mini-e2e-helm/k8s-1.24" + - "status-success=ci/centos/mini-e2e-helm/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" + - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/upgrade-tests-cephfs" - "status-success=ci/centos/upgrade-tests-rbd" - "status-success=DCO"