Merge pull request #184 from ceph/devel

Sync downstream devel with upstream devel branch

.github/dependabot.yml

@@ -1,5 +1,6 @@
 ---
 version: 2
+enable-beta-ecosystems: true
 updates:
   - package-ecosystem: "gomod"
     # ODF only: disable PR creation, synced from upstream
@@ -8,6 +9,20 @@ updates:
     schedule:
       interval: "weekly"
     rebase-strategy: "disabled"
+    groups:
+      golang-dependencies:
+        patterns:
+          - "github.com/golang*"
+      k8s-dependencies:
+        patterns:
+          - "k8s.io*"
+          - "sigs.k8s.io*"
+      github-dependencies:
+        patterns:
+          - "github.com*"
+        exclude-patterns:
+          - "github.com/golang*"
+          - "github.com/container-storage-interface/spec"
     labels:
       - rebase
     commit-message:
@@ -59,6 +74,19 @@ updates:
     schedule:
       interval: "weekly"
     rebase-strategy: "disabled"
+    groups:
+      golang-dependencies:
+        patterns:
+          - "github.com/golang*"
+      k8s-dependencies:
+        patterns:
+          - "k8s.io*"
+          - "sigs.k8s.io*"
+      github-dependencies:
+        patterns:
+          - "github.com*"
+        exclude-patterns:
+          - "github.com/golang*"
     labels:
       - rebase
       - ci/skip/e2e

.github/workflows/pull-request-commentor.yaml

@@ -8,87 +8,74 @@ on:
       - "release-v*"
     types:
       - labeled
+
+permissions:
+  pull-requests: write
+
 jobs:
-  add-comment:
+  branch-k8s-selection:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        branch: [release-v3.8, release-v3.9, devel]
+        k8s: ["1.25", "1.26", "1.27", "1.28"]
+        exclude:
+          # the next Ceph-CSI version will not be tested with old Kubernetes
+          - k8s: "1.25"
+            branch: "devel"
+
+          # Ceph-CSI <= 3.9 was released before Kubernetes 1.28
+          - k8s: "1.28"
+            branch: "release-v3.8"
+          - k8s: "1.28"
+            branch: "release-v3.9"
+
+    # watch out, matrix.branch can not be used in this if-statement :-/
     if: >
       (github.event.label.name == 'ok-to-test' &&
       github.event.pull_request.merged != true)
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
+
     steps:
-      - name: Add comment to trigger external storage tests for Kubernetes 1.25
+      - name: >
+          Add comment to trigger external storage tests for Kubernetes
+          ${{ matrix.k8s }}
+        if: ${{ github.base_ref == matrix.branch }}
         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.25
+            /test ci/centos/k8s-e2e-external-storage/${{ matrix.k8s }}
 
-      - name: Add comment to trigger external storage tests for Kubernetes 1.26
+      - name: >
+          Add comment to trigger helm E2E tests for Kubernetes
+          ${{ matrix.k8s }}
+        if: ${{ github.base_ref == matrix.branch }}
         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.26
+            /test ci/centos/mini-e2e-helm/k8s-${{ matrix.k8s }}
 
-      - name: Add comment to trigger external storage tests for Kubernetes 1.27
+      - name: Add comment to trigger E2E tests for Kubernetes ${{ matrix.k8s }}
         uses: peter-evans/create-or-update-comment@v3
+        if: ${{ github.base_ref == matrix.branch }}
         with:
           token: ${{ secrets.CEPH_CSI_BOT_TOKEN }}
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            /test ci/centos/k8s-e2e-external-storage/1.27
+            /test ci/centos/mini-e2e/k8s-${{ matrix.k8s }}
 
-      - name: Add comment to trigger helm E2E tests for Kubernetes 1.25
-        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.25
+  any-branch-k8s-version:
+    runs-on: ubuntu-latest
 
-      - name: Add comment to trigger helm E2E tests for Kubernetes 1.26
-        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.26
-
-      - name: Add comment to trigger helm E2E tests for Kubernetes 1.27
-        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.27
-
-      - name: Add comment to trigger E2E tests for Kubernetes 1.25
-        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.25
-
-      - name: Add comment to trigger E2E tests for Kubernetes 1.26
-        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.26
-
-      - name: Add comment to trigger E2E tests for Kubernetes 1.27
-        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.27
+    if: >
+      (github.event.label.name == 'ok-to-test' &&
+      github.event.pull_request.merged != true)
 
+    steps:
       - name: Add comment to trigger cephfs upgrade tests
         uses: peter-evans/create-or-update-comment@v3
         with:
@@ -105,6 +92,19 @@ jobs:
           body: |
             /test ci/centos/upgrade-tests-rbd
 
+  remove-label:
+    runs-on: ubuntu-latest
+
+    # run after the other jobs
+    needs:
+      - branch-k8s-selection
+      - any-branch-k8s-version
+
+    if: >
+      (github.event.label.name == 'ok-to-test' &&
+      github.event.pull_request.merged != true)
+
+    steps:
       - name: remove ok-to-test-label after commenting
         uses: actions/github-script@v6
         with: