diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 8d90d3a53b8..b75264a5402 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -17,14 +17,6 @@ jobs: permissions: pull-requests: write steps: - - name: Add comment to trigger external storage tests for Kubernetes 1.24 - uses: peter-evans/create-or-update-comment@v3 - with: - token: ${{ secrets.CEPH_CSI_BOT_TOKEN }} - issue-number: ${{ github.event.pull_request.number }} - 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@v3 with: @@ -49,14 +41,6 @@ jobs: body: | /test ci/centos/k8s-e2e-external-storage/1.27 - - name: Add comment to trigger helm E2E tests for Kubernetes 1.24 - uses: peter-evans/create-or-update-comment@v3 - with: - token: ${{ secrets.CEPH_CSI_BOT_TOKEN }} - issue-number: ${{ github.event.pull_request.number }} - 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@v3 with: @@ -81,14 +65,6 @@ jobs: body: | /test ci/centos/mini-e2e-helm/k8s-1.27 - - name: Add comment to trigger E2E tests for Kubernetes 1.24 - uses: peter-evans/create-or-update-comment@v3 - with: - token: ${{ secrets.CEPH_CSI_BOT_TOKEN }} - issue-number: ${{ github.event.pull_request.number }} - 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@v3 with: diff --git a/.mergify.yml b/.mergify.yml index 9c8538bb2e6..4cf2cbc9e39 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -29,15 +29,12 @@ queue_rules: - "status-success=golangci-lint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "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-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" @@ -98,15 +95,12 @@ pull_request_rules: - "status-success=golangci-lint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "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-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" @@ -140,15 +134,12 @@ pull_request_rules: - "status-success=commitlint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "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-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27" @@ -174,15 +165,12 @@ pull_request_rules: - "status-success=mod-check" - "status-success=lint-extras" - "#changes-requested-reviews-by=0" - - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - "status-success=ci/centos/k8s-e2e-external-storage/1.25" - "status-success=ci/centos/k8s-e2e-external-storage/1.26" - "status-success=ci/centos/k8s-e2e-external-storage/1.27" - - "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-helm/k8s-1.26" - "status-success=ci/centos/mini-e2e-helm/k8s-1.27" - - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/mini-e2e/k8s-1.25" - "status-success=ci/centos/mini-e2e/k8s-1.26" - "status-success=ci/centos/mini-e2e/k8s-1.27"