From 13ba4058f1436a5cc02c8aa4bb1047308134f430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl>
Date: Tue, 16 Jul 2024 10:49:44 +0200
Subject: [PATCH] tmp: test repair multiple times

---
 .github/cfg/integration-test-core.yaml        | 32 +++----------------
 ...ration-tests-2023.1.9-IPV4-raftschema.yaml | 24 +++-----------
 .../integration-tests-2023.1.9-IPV4.yaml      | 24 +++-----------
 ...ration-tests-2023.1.9-IPV6-raftschema.yaml | 24 +++-----------
 ...tegration-tests-2024.1.5-IPV4-tablets.yaml | 24 +++-----------
 .../integration-tests-2024.1.5-IPV4.yaml      | 24 +++-----------
 ...tegration-tests-2024.1.5-IPV6-tablets.yaml | 24 +++-----------
 .../integration-tests-6.0.1-IPV4-tablets.yaml | 24 +++-----------
 .../integration-tests-6.0.1-IPV4.yaml         | 24 +++-----------
 .../integration-tests-6.0.1-IPV6-tablets.yaml | 24 +++-----------
 ...-tests-latest-enterprise-IPV4-tablets.yaml | 24 +++-----------
 ...egration-tests-latest-enterprise-IPV4.yaml | 24 +++-----------
 12 files changed, 48 insertions(+), 248 deletions(-)

diff --git a/.github/cfg/integration-test-core.yaml b/.github/cfg/integration-test-core.yaml
index 262bcc21f..771973a22 100644
--- a/.github/cfg/integration-test-core.yaml
+++ b/.github/cfg/integration-test-core.yaml
@@ -28,7 +28,7 @@ jobs:
           tablets: ${{ env.tablets }}
 
       - name: Run tests
-        run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+        run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 
   restore-schema:
     name: Test restore schema
@@ -48,7 +48,7 @@ jobs:
         # 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=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+        run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 
   backup:
     name: Test backup
@@ -66,7 +66,7 @@ jobs:
           tablets: ${{ env.tablets }}
 
       - name: Run tests
-        run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+        run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 
   repair:
     name: Test repair
@@ -106,28 +106,4 @@ jobs:
           tablets: ${{ env.tablets }}
 
       - 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
+        run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
diff --git a/.github/workflows/integration-tests-2023.1.9-IPV4-raftschema.yaml b/.github/workflows/integration-tests-2023.1.9-IPV4-raftschema.yaml
index 3910f1644..79f835eed 100644
--- a/.github/workflows/integration-tests-2023.1.9-IPV4-raftschema.yaml
+++ b/.github/workflows/integration-tests-2023.1.9-IPV4-raftschema.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-2023.1.9-IPV4-raftschema
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-2023.1.9-IPV4.yaml b/.github/workflows/integration-tests-2023.1.9-IPV4.yaml
index c167bea97..cd2528348 100644
--- a/.github/workflows/integration-tests-2023.1.9-IPV4.yaml
+++ b/.github/workflows/integration-tests-2023.1.9-IPV4.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-2023.1.9-IPV4
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-2023.1.9-IPV6-raftschema.yaml b/.github/workflows/integration-tests-2023.1.9-IPV6-raftschema.yaml
index 7dab59a83..0a8763635 100644
--- a/.github/workflows/integration-tests-2023.1.9-IPV6-raftschema.yaml
+++ b/.github/workflows/integration-tests-2023.1.9-IPV6-raftschema.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-2023.1.9-IPV6-raftschema
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-2024.1.5-IPV4-tablets.yaml b/.github/workflows/integration-tests-2024.1.5-IPV4-tablets.yaml
index 07761e0ec..d2c5fe092 100644
--- a/.github/workflows/integration-tests-2024.1.5-IPV4-tablets.yaml
+++ b/.github/workflows/integration-tests-2024.1.5-IPV4-tablets.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-2024.1.5-IPV4-tablets
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-2024.1.5-IPV4.yaml b/.github/workflows/integration-tests-2024.1.5-IPV4.yaml
index d15fdfa36..d3fd9f61f 100644
--- a/.github/workflows/integration-tests-2024.1.5-IPV4.yaml
+++ b/.github/workflows/integration-tests-2024.1.5-IPV4.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-2024.1.5-IPV4
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-2024.1.5-IPV6-tablets.yaml b/.github/workflows/integration-tests-2024.1.5-IPV6-tablets.yaml
index e1262f551..94ec08873 100644
--- a/.github/workflows/integration-tests-2024.1.5-IPV6-tablets.yaml
+++ b/.github/workflows/integration-tests-2024.1.5-IPV6-tablets.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-2024.1.5-IPV6-tablets
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-6.0.1-IPV4-tablets.yaml b/.github/workflows/integration-tests-6.0.1-IPV4-tablets.yaml
index 1d1b3a5bd..126526592 100644
--- a/.github/workflows/integration-tests-6.0.1-IPV4-tablets.yaml
+++ b/.github/workflows/integration-tests-6.0.1-IPV4-tablets.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-6.0.1-IPV4-tablets
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-6.0.1-IPV4.yaml b/.github/workflows/integration-tests-6.0.1-IPV4.yaml
index 2c6da14e4..993e8c41d 100644
--- a/.github/workflows/integration-tests-6.0.1-IPV4.yaml
+++ b/.github/workflows/integration-tests-6.0.1-IPV4.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-6.0.1-IPV4
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-6.0.1-IPV6-tablets.yaml b/.github/workflows/integration-tests-6.0.1-IPV6-tablets.yaml
index 842b0f440..e87a611b5 100644
--- a/.github/workflows/integration-tests-6.0.1-IPV6-tablets.yaml
+++ b/.github/workflows/integration-tests-6.0.1-IPV6-tablets.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-6.0.1-IPV6-tablets
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-latest-enterprise-IPV4-tablets.yaml b/.github/workflows/integration-tests-latest-enterprise-IPV4-tablets.yaml
index 01d2012c4..d6b71e785 100644
--- a/.github/workflows/integration-tests-latest-enterprise-IPV4-tablets.yaml
+++ b/.github/workflows/integration-tests-latest-enterprise-IPV4-tablets.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-latest-enterprise-IPV4-tablets
 "on":
     pull_request:
diff --git a/.github/workflows/integration-tests-latest-enterprise-IPV4.yaml b/.github/workflows/integration-tests-latest-enterprise-IPV4.yaml
index 43a8bd8d1..2f272b4a6 100644
--- a/.github/workflows/integration-tests-latest-enterprise-IPV4.yaml
+++ b/.github/workflows/integration-tests-latest-enterprise-IPV4.yaml
@@ -21,7 +21,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     repair:
         name: Test repair
         runs-on: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestore([^T]|.{1}[^a]|.{2}[^b]|.{3}[^l]|.{4}[^e]|.{5}[^s]).*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     restore-tables:
         name: Test restore tables
         runs-on: ubuntu-latest
@@ -66,7 +66,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - name: Run tests
-              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"'
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
     small-pkg:
         name: Test other, smaller packages
         runs-on: ubuntu-latest
@@ -84,23 +84,7 @@ jobs:
                 scylla-version: ${{ env.scylla-version }}
                 tablets: ${{ env.tablets }}
             - 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
+              run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair
 name: integration-tests-latest-enterprise-IPV4
 "on":
     pull_request: