commit

scylladb · Feb 20, 2024 · 99b1f3c · 99b1f3c
1 parent d0398ab
commit 99b1f3c
Show file tree

Hide file tree

Showing 2 changed files with 142 additions and 16 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -26,19 +26,19 @@ jobs:
       - name: Run unit tests
         run: make unit-test
 
-  integration-tests:
-    strategy:
-      fail-fast: false
-      matrix:
-        # Due to Scylla issue #16349 it is expected that restore-schema
-        # jobs with the following config will fail (4 jobs total):
-        # - scylla-version: scylla:5.2.X,               raft-enabled: true
-        # - scylla-version: scylla-enterprise:2024.1.X, raft-enabled: true
-        scylla-version: [ 'scylla:5.2.13', 'scylla:5.4.1', 'scylla-enterprise:2023.1.3', 'scylla-enterprise:2024.1.0-rc3' ]
-        ip-family: [ IPV4, IPV6 ]
-        raft-enabled: [ true, false ]
-    uses: ./.github/workflows/integration-tests.yaml
-    with:
-      scylla-version: ${{ matrix.scylla-version }}
-      ip-family: ${{ matrix.ip-family }}
-      raft-enabled: ${{ matrix.raft-enabled }}
+#  integration-tests:
+#    strategy:
+#      fail-fast: false
+#      matrix:
+#        # Due to Scylla issue #16349 it is expected that restore-schema
+#        # jobs with the following config will fail (4 jobs total):
+#        # - scylla-version: scylla:5.2.X,               raft-enabled: true
+#        # - scylla-version: scylla-enterprise:2024.1.X, raft-enabled: true
+#        scylla-version: [ 'scylla:5.2.13', 'scylla:5.4.1', 'scylla-enterprise:2023.1.3', 'scylla-enterprise:2024.1.0-rc3' ]
+#        ip-family: [ IPV4, IPV6 ]
+#        raft-enabled: [ true, false ]
+#    uses: ./.github/workflows/integration-tests.yaml
+#    with:
+#      scylla-version: ${{ matrix.scylla-version }}
+#      ip-family: ${{ matrix.ip-family }}
+#      raft-enabled: ${{ matrix.raft-enabled }}
diff --git a/.github/workflows/integration-tests-5.2.13-ipv4.yaml b/.github/workflows/integration-tests-5.2.13-ipv4.yaml
@@ -0,0 +1,126 @@
+name: Integration tests (Scylla 5.2.13, IPv4)
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [ opened, synchronize, reopened ]
+
+jobs:
+  # Right now both restore-tables and restore-schema tests take way longer than any other pkg tests.
+  # For this reason they are divided into two distinct jobs, so that the whole workflow can be executed faster.
+  restore-tables:
+    name: Test restore tables
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Setup testing dependencies
+        uses: ./.github/actions/test-setup
+        with:
+          scylla-version: 'scylla:5.2.13'
+          ip-family: IPV4
+          raft-enabled: false
+
+      - name: Run tests
+        run: make pkg-integration-test IP_FAMILY=IPV4 PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+
+  restore-schema:
+    name: Test restore schema
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Setup testing dependencies
+        uses: ./.github/actions/test-setup
+        with:
+          scylla-version: 'scylla:5.2.13'
+          ip-family: IPV4
+          raft-enabled: false
+
+        # Go does not support negative lookahead in regex expressions, so it has to be done manually.
+        # This regex ensures that all restore tests that didn't match restore-tables job will be run here.
+      - name: Run tests
+        run: make pkg-integration-test IP_FAMILY=IPV4 PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+
+  backup:
+    name: Test backup
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Setup testing dependencies
+        uses: ./.github/actions/test-setup
+        with:
+          scylla-version: 'scylla:5.2.13'
+          ip-family: IPV4
+          raft-enabled: false
+
+      - name: Run tests
+        run: make pkg-integration-test IP_FAMILY=IPV4 PKG=./pkg/service/backup
+
+  repair:
+    name: Test repair
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Setup testing dependencies
+        uses: ./.github/actions/test-setup
+        with:
+          scylla-version: 'scylla:5.2.13'
+          ip-family: IPV4
+          raft-enabled: false
+
+      - name: Run tests
+        run: make pkg-integration-test IP_FAMILY=IPV4 PKG=./pkg/service/repair
+
+  small-pkg:
+    name: Test other, smaller packages
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Set IP_FAMILY var for all tests
+        run: |
+          echo "IP_FAMILY=IPV4" >> $GITHUB_ENV
+
+      - name: Setup testing dependencies
+        uses: ./.github/actions/test-setup
+        with:
+          scylla-version: 'scylla:5.2.13'
+          ip-family: IPV4
+          raft-enabled: false
+
+      - name: Run cqlping tests
+        run: make pkg-integration-test PKG=./pkg/ping/cqlping
+
+      - name: Run dynamoping tests
+        run: make pkg-integration-test PKG=./pkg/ping/dynamoping
+
+      - name: Run scyllaclient tests
+        run: make pkg-integration-test PKG=./pkg/scyllaclient
+
+      - name: Run cluster tests
+        run: make pkg-integration-test PKG=./pkg/service/cluster
+
+      - name: Run healthcheck tests
+        run: make pkg-integration-test PKG=./pkg/service/healthcheck
+
+      - name: Run scheduler tests
+        run: make pkg-integration-test PKG=./pkg/service/scheduler
+
+      - name: Run store tests
+        run: make pkg-integration-test PKG=./pkg/store
+
+      - name: Run migrate tests
+        run: make pkg-integration-test PKG=./pkg/schema/migrate
+
+      - name: Run netwait tests
+        run: make pkg-integration-test PKG=./pkg/util/netwait