diff --git a/.github/workflows/pull-request-commentor.yaml b/.github/workflows/pull-request-commentor.yaml index 664439d00..9a10ef5fd 100644 --- a/.github/workflows/pull-request-commentor.yaml +++ b/.github/workflows/pull-request-commentor.yaml @@ -15,13 +15,6 @@ jobs: permissions: pull-requests: write steps: - - name: Add comment to trigger external storage tests for Kubernetes 1.22 - 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.22 - - name: Add comment to trigger external storage tests for Kubernetes 1.23 uses: peter-evans/create-or-update-comment@v2 with: @@ -36,13 +29,6 @@ jobs: body: | /test ci/centos/k8s-e2e-external-storage/1.24 - - name: Add comment to trigger helm E2E tests for Kubernetes 1.22 - 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.22 - - name: Add comment to trigger helm E2E tests for Kubernetes 1.23 uses: peter-evans/create-or-update-comment@v2 with: @@ -57,13 +43,6 @@ jobs: body: | /test ci/centos/mini-e2e-helm/k8s-1.24 - - name: Add comment to trigger E2E tests for Kubernetes 1.22 - uses: peter-evans/create-or-update-comment@v2 - with: - issue-number: ${{ github.event.pull_request.number }} - body: | - /test ci/centos/mini-e2e/k8s-1.22 - - name: Add comment to trigger E2E tests for Kubernetes 1.23 uses: peter-evans/create-or-update-comment@v2 with: diff --git a/.mergify.yml b/.mergify.yml index fdb63fc0d..4fbf28603 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -26,13 +26,10 @@ queue_rules: - "status-success=golangci-lint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.22" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.22" - "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/k8s-1.22" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/upgrade-tests-cephfs" @@ -75,13 +72,10 @@ pull_request_rules: - "status-success=golangci-lint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.22" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.22" - "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/k8s-1.22" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/upgrade-tests-cephfs" @@ -114,13 +108,10 @@ pull_request_rules: - "status-success=commitlint" - "status-success=mod-check" - "status-success=lint-extras" - - "status-success=ci/centos/k8s-e2e-external-storage/1.22" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.22" - "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/k8s-1.22" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/upgrade-tests-cephfs" @@ -145,13 +136,10 @@ 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.22" - "status-success=ci/centos/k8s-e2e-external-storage/1.23" - "status-success=ci/centos/k8s-e2e-external-storage/1.24" - - "status-success=ci/centos/mini-e2e-helm/k8s-1.22" - "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/k8s-1.22" - "status-success=ci/centos/mini-e2e/k8s-1.23" - "status-success=ci/centos/mini-e2e/k8s-1.24" - "status-success=ci/centos/upgrade-tests-cephfs"