From d657e08fd7e40dc23073b558613a67756d398e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Leszczy=C5=84ski?= <2000michal@wp.pl> Date: Fri, 15 Mar 2024 13:35:27 +0100 Subject: [PATCH] TMP: fix setup --- .github/actions/test-setup/action.yml | 7 +- .../integration-tests-2023.1.3-ipv4-raft.yaml | 133 ----------------- .../integration-tests-2023.1.3-ipv4.yaml | 133 ----------------- .../integration-tests-2023.1.3-ipv6-raft.yaml | 133 ----------------- .../integration-tests-2023.1.3-ipv6.yaml | 133 ----------------- .../integration-tests-2024.1.0.rc3-ipv4.yaml | 135 ------------------ ...egration-tests-2024.1.0.rc3-ipv6-raft.yaml | 135 ------------------ .../integration-tests-2024.1.0.rc3-ipv6.yaml | 135 ------------------ .../integration-tests-5.2.13-ipv4-raft.yaml | 133 ----------------- .../integration-tests-5.2.13-ipv4.yaml | 133 ----------------- .../integration-tests-5.2.13-ipv6-raft.yaml | 133 ----------------- .../integration-tests-5.2.13-ipv6.yaml | 133 ----------------- .../integration-tests-5.4.1-ipv4-raft.yaml | 133 ----------------- .../integration-tests-5.4.1-ipv4.yaml | 133 ----------------- .../integration-tests-5.4.1-ipv6-raft.yaml | 133 ----------------- .../integration-tests-5.4.1-ipv6.yaml | 133 ----------------- ...ipv4-raftschema-rafttopology-tablets.yaml} | 20 ++- ...nightly-ipv4-raftschema-rafttopology.yaml} | 28 ++-- ...ration-tests-nightly-ipv4-raftschema.yaml} | 20 ++- Makefile | 5 +- testing/Makefile | 14 +- 21 files changed, 64 insertions(+), 2031 deletions(-) delete mode 100644 .github/workflows/integration-tests-2023.1.3-ipv4-raft.yaml delete mode 100644 .github/workflows/integration-tests-2023.1.3-ipv4.yaml delete mode 100644 .github/workflows/integration-tests-2023.1.3-ipv6-raft.yaml delete mode 100644 .github/workflows/integration-tests-2023.1.3-ipv6.yaml delete mode 100644 .github/workflows/integration-tests-2024.1.0.rc3-ipv4.yaml delete mode 100644 .github/workflows/integration-tests-2024.1.0.rc3-ipv6-raft.yaml delete mode 100644 .github/workflows/integration-tests-2024.1.0.rc3-ipv6.yaml delete mode 100644 .github/workflows/integration-tests-5.2.13-ipv4-raft.yaml delete mode 100644 .github/workflows/integration-tests-5.2.13-ipv4.yaml delete mode 100644 .github/workflows/integration-tests-5.2.13-ipv6-raft.yaml delete mode 100644 .github/workflows/integration-tests-5.2.13-ipv6.yaml delete mode 100644 .github/workflows/integration-tests-5.4.1-ipv4-raft.yaml delete mode 100644 .github/workflows/integration-tests-5.4.1-ipv4.yaml delete mode 100644 .github/workflows/integration-tests-5.4.1-ipv6-raft.yaml delete mode 100644 .github/workflows/integration-tests-5.4.1-ipv6.yaml rename .github/workflows/{integration-tests-nightly-ipv4-raft-tablets.yaml => integration-tests-nightly-ipv4-raftschema-rafttopology-tablets.yaml} (87%) rename .github/workflows/{integration-tests-2024.1.0.rc3-ipv4-raft.yaml => integration-tests-nightly-ipv4-raftschema-rafttopology.yaml} (82%) rename .github/workflows/{integration-tests-nightly-ipv4-raft.yaml => integration-tests-nightly-ipv4-raftschema.yaml} (88%) diff --git a/.github/actions/test-setup/action.yml b/.github/actions/test-setup/action.yml index 8be1f2b53d..a9f3e8914f 100644 --- a/.github/actions/test-setup/action.yml +++ b/.github/actions/test-setup/action.yml @@ -8,9 +8,12 @@ inputs: ip-family: description: "Specifies IP family for test environment (IPV4/IPV6)" required: false - raft-enabled: + raft-schema: description: "Specifies if cluster should use consistent_cluster_management option" required: false + raft-topology: + description: "Specifies if cluster should use consistent-topology-changes option" + required: false tablets: description: "Specifies if cluster should use tablets replication" required: false @@ -42,5 +45,5 @@ runs: - name: Start dev env if: inputs.start-dev-env == 'true' - run: make start-dev-env SCYLLA_VERSION=${{ inputs.scylla-version }} IP_FAMILY=${{ inputs.ip-family }} RAFT_ENABLED=${{ inputs.raft-enabled }} TABLETS=${{ inputs.tablets }} + run: make start-dev-env SCYLLA_VERSION=${{ inputs.scylla-version }} IP_FAMILY=${{ inputs.ip-family }} RAFT_SCHEMA=${{ inputs.raft-schema }} RAFT_TOPOLOGY=${{ inputs.raft-topology }} TABLETS=${{ inputs.tablets }} shell: bash \ No newline at end of file diff --git a/.github/workflows/integration-tests-2023.1.3-ipv4-raft.yaml b/.github/workflows/integration-tests-2023.1.3-ipv4-raft.yaml deleted file mode 100644 index e69a5683e5..0000000000 --- a/.github/workflows/integration-tests-2023.1.3-ipv4-raft.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla Enterprise 2023.1.3, IPV4, raft) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla-enterprise:2023.1.3' - ip-family: IPV4 - raft-enabled: true - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-2023.1.3-ipv4.yaml b/.github/workflows/integration-tests-2023.1.3-ipv4.yaml deleted file mode 100644 index a6fc66d7b7..0000000000 --- a/.github/workflows/integration-tests-2023.1.3-ipv4.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla Enterprise 2023.1.3, IPV4) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla-enterprise:2023.1.3' - ip-family: IPV4 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-2023.1.3-ipv6-raft.yaml b/.github/workflows/integration-tests-2023.1.3-ipv6-raft.yaml deleted file mode 100644 index 4c67ebd37d..0000000000 --- a/.github/workflows/integration-tests-2023.1.3-ipv6-raft.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla Enterprise 2023.1.3, IPV6, raft) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla-enterprise:2023.1.3' - ip-family: IPV6 - raft-enabled: true - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-2023.1.3-ipv6.yaml b/.github/workflows/integration-tests-2023.1.3-ipv6.yaml deleted file mode 100644 index d8df77ea8a..0000000000 --- a/.github/workflows/integration-tests-2023.1.3-ipv6.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla Enterprise 2023.1.3, IPV6) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla-enterprise:2023.1.3' - ip-family: IPV6 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-2024.1.0.rc3-ipv4.yaml b/.github/workflows/integration-tests-2024.1.0.rc3-ipv4.yaml deleted file mode 100644 index 7085c84481..0000000000 --- a/.github/workflows/integration-tests-2024.1.0.rc3-ipv4.yaml +++ /dev/null @@ -1,135 +0,0 @@ -name: Integration tests (Scylla Enterprise 2024.1.0-rc3, IPV4) - -on: - push: - branches: - - master - pull_request: - types: [ opened, synchronize, reopened ] - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla-enterprise:2023.1.3' - ip-family: IPV4 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-2024.1.0.rc3-ipv6-raft.yaml b/.github/workflows/integration-tests-2024.1.0.rc3-ipv6-raft.yaml deleted file mode 100644 index bc5e8bfd01..0000000000 --- a/.github/workflows/integration-tests-2024.1.0.rc3-ipv6-raft.yaml +++ /dev/null @@ -1,135 +0,0 @@ -name: Integration tests (Scylla Enterprise 2024.1.0-rc3, IPV6, raft) - -on: - push: - branches: - - master - pull_request: - types: [ opened, synchronize, reopened ] - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla-enterprise:2024.1.0-rc3' - ip-family: IPV6 - raft-enabled: true - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-2024.1.0.rc3-ipv6.yaml b/.github/workflows/integration-tests-2024.1.0.rc3-ipv6.yaml deleted file mode 100644 index cacf6782a8..0000000000 --- a/.github/workflows/integration-tests-2024.1.0.rc3-ipv6.yaml +++ /dev/null @@ -1,135 +0,0 @@ -name: Integration tests (Scylla Enterprise 2024.1.0-rc3, IPV6) - -on: - push: - branches: - - master - pull_request: - types: [ opened, synchronize, reopened ] - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla-enterprise:2024.1.0-rc3' - ip-family: IPV6 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.2.13-ipv4-raft.yaml b/.github/workflows/integration-tests-5.2.13-ipv4-raft.yaml deleted file mode 100644 index 8a3ef167e7..0000000000 --- a/.github/workflows/integration-tests-5.2.13-ipv4-raft.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.2.13, IPV4, raft) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.2.13' - ip-family: IPV4 - raft-enabled: true - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.2.13-ipv4.yaml b/.github/workflows/integration-tests-5.2.13-ipv4.yaml deleted file mode 100644 index 5a571d7cac..0000000000 --- a/.github/workflows/integration-tests-5.2.13-ipv4.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.2.13, IPV4) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.2.13' - ip-family: IPV4 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.2.13-ipv6-raft.yaml b/.github/workflows/integration-tests-5.2.13-ipv6-raft.yaml deleted file mode 100644 index b85d097509..0000000000 --- a/.github/workflows/integration-tests-5.2.13-ipv6-raft.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.2.13, IPV6, raft) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.2.13' - ip-family: IPV6 - raft-enabled: true - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.2.13-ipv6.yaml b/.github/workflows/integration-tests-5.2.13-ipv6.yaml deleted file mode 100644 index a750bb53d3..0000000000 --- a/.github/workflows/integration-tests-5.2.13-ipv6.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.2.13, IPV6) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.2.13' - ip-family: IPV6 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.4.1-ipv4-raft.yaml b/.github/workflows/integration-tests-5.4.1-ipv4-raft.yaml deleted file mode 100644 index 1c7285fe40..0000000000 --- a/.github/workflows/integration-tests-5.4.1-ipv4-raft.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.4.1, IPV4, raft) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.4.1' - ip-family: IPV4 - raft-enabled: true - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.4.1-ipv4.yaml b/.github/workflows/integration-tests-5.4.1-ipv4.yaml deleted file mode 100644 index 9f711b52df..0000000000 --- a/.github/workflows/integration-tests-5.4.1-ipv4.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.4.1, IPV4) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.4.1' - ip-family: IPV4 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.4.1-ipv6-raft.yaml b/.github/workflows/integration-tests-5.4.1-ipv6-raft.yaml deleted file mode 100644 index f92ef8270d..0000000000 --- a/.github/workflows/integration-tests-5.4.1-ipv6-raft.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.4.1, IPV6, raft) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.4.1' - ip-family: IPV6 - raft-enabled: true - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-5.4.1-ipv6.yaml b/.github/workflows/integration-tests-5.4.1-ipv6.yaml deleted file mode 100644 index f778abac55..0000000000 --- a/.github/workflows/integration-tests-5.4.1-ipv6.yaml +++ /dev/null @@ -1,133 +0,0 @@ -name: Integration tests (Scylla 5.4.1, IPV6) - -on: - push: - branches: - - master - -concurrency: - group: int-${{ github.workflow }}-${{ github.ref }} - cancel-in-progress: true - -env: - scylla-version: 'scylla:5.4.1' - ip-family: IPV6 - raft-enabled: false - -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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - # 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"' - - 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} 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: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - name: Run tests - 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 - 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=${{ env.ip-family }}" >> $GITHUB_ENV - - - name: Setup testing dependencies - uses: ./.github/actions/test-setup - with: - scylla-version: ${{ env.scylla-version }} - ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} - - - 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 diff --git a/.github/workflows/integration-tests-nightly-ipv4-raft-tablets.yaml b/.github/workflows/integration-tests-nightly-ipv4-raftschema-rafttopology-tablets.yaml similarity index 87% rename from .github/workflows/integration-tests-nightly-ipv4-raft-tablets.yaml rename to .github/workflows/integration-tests-nightly-ipv4-raftschema-rafttopology-tablets.yaml index bec4cb0482..7494cb8f4b 100644 --- a/.github/workflows/integration-tests-nightly-ipv4-raft-tablets.yaml +++ b/.github/workflows/integration-tests-nightly-ipv4-raftschema-rafttopology-tablets.yaml @@ -1,4 +1,4 @@ -name: Integration tests (Scylla Nightly latest, IPV4, raft, tablets) +name: Integration tests (Scylla Nightly, IPV4, raft schema, raft topology, tablets) on: push: @@ -14,7 +14,8 @@ concurrency: env: scylla-version: 'scylla-nightly:5.5.0-dev-0.20240314.ce1784186042' ip-family: IPV4 - raft-enabled: true + raft-schema: true + raft-topology: true tablets: true jobs: @@ -32,7 +33,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run tests @@ -50,7 +52,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} # Go does not support negative lookahead in regex expressions, so it has to be done manually. @@ -70,7 +73,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run tests @@ -88,7 +92,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run tests @@ -110,7 +115,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run cqlping tests diff --git a/.github/workflows/integration-tests-2024.1.0.rc3-ipv4-raft.yaml b/.github/workflows/integration-tests-nightly-ipv4-raftschema-rafttopology.yaml similarity index 82% rename from .github/workflows/integration-tests-2024.1.0.rc3-ipv4-raft.yaml rename to .github/workflows/integration-tests-nightly-ipv4-raftschema-rafttopology.yaml index c6501eea73..fcb1677082 100644 --- a/.github/workflows/integration-tests-2024.1.0.rc3-ipv4-raft.yaml +++ b/.github/workflows/integration-tests-nightly-ipv4-raftschema-rafttopology.yaml @@ -1,4 +1,4 @@ -name: Integration tests (Scylla Enterprise 2024.1.0-rc3, IPV4, raft) +name: Integration tests (Scylla Nightly, IPV4, raft schema, raft topology) on: push: @@ -12,9 +12,11 @@ concurrency: cancel-in-progress: true env: - scylla-version: 'scylla-enterprise:2024.1.0-rc3' + scylla-version: 'scylla-nightly:5.5.0-dev-0.20240314.ce1784186042' ip-family: IPV4 - raft-enabled: true + raft-schema: true + raft-topology: true + tablets: false jobs: # Right now both restore-tables and restore-schema tests take way longer than any other pkg tests. @@ -31,7 +33,9 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} + tablets: ${{ env.tablets }} - name: Run tests run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/restore RUN='"TestRestoreTables.*Integration"' @@ -48,7 +52,9 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} + tablets: ${{ env.tablets }} # 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. @@ -67,7 +73,9 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} + tablets: ${{ env.tablets }} - name: Run tests run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/backup @@ -84,7 +92,9 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} + tablets: ${{ env.tablets }} - name: Run tests run: make pkg-integration-test IP_FAMILY=${{ env.ip-family }} PKG=./pkg/service/repair @@ -105,7 +115,9 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} + tablets: ${{ env.tablets }} - name: Run cqlping tests run: make pkg-integration-test PKG=./pkg/ping/cqlping diff --git a/.github/workflows/integration-tests-nightly-ipv4-raft.yaml b/.github/workflows/integration-tests-nightly-ipv4-raftschema.yaml similarity index 88% rename from .github/workflows/integration-tests-nightly-ipv4-raft.yaml rename to .github/workflows/integration-tests-nightly-ipv4-raftschema.yaml index 493395fb6d..28a28ad955 100644 --- a/.github/workflows/integration-tests-nightly-ipv4-raft.yaml +++ b/.github/workflows/integration-tests-nightly-ipv4-raftschema.yaml @@ -1,4 +1,4 @@ -name: Integration tests (Scylla Nightly latest, IPV4, raft) +name: Integration tests (Scylla Nightly, IPV4, raft schema) on: push: @@ -14,7 +14,8 @@ concurrency: env: scylla-version: 'scylla-nightly:5.5.0-dev-0.20240314.ce1784186042' ip-family: IPV4 - raft-enabled: true + raft-schema: true + raft-topology: false tablets: false jobs: @@ -32,7 +33,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run tests @@ -50,7 +52,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} # Go does not support negative lookahead in regex expressions, so it has to be done manually. @@ -70,7 +73,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run tests @@ -88,7 +92,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run tests @@ -110,7 +115,8 @@ jobs: with: scylla-version: ${{ env.scylla-version }} ip-family: ${{ env.ip-family }} - raft-enabled: ${{ env.raft-enabled }} + raft-schema: ${{ env.raft-schema }} + raft-topology: ${{ env.raft-topology }} tablets: ${{ env.tablets }} - name: Run cqlping tests diff --git a/Makefile b/Makefile index d3eef45836..9979d52d09 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,8 @@ GOFILES = go list -f '{{range .GoFiles}}{{ $$.Dir }}/{{ . }} {{end}}{{range .Tes SCYLLA_VERSION?=scylla:5.4.1 IP_FAMILY?=IPV4 -RAFT_ENABLED?=true +RAFT_SCHEMA?=true +RAFT_TOPOLOGY?=false TABLETS?=false SKIP_GOSSIP?=false @@ -172,7 +173,7 @@ start-dev-env: .testing-up deploy-agent build-cli .PHONY: .testing-up .testing-up: - @IPV6=$(IPV6) SCYLLA_VERSION=$(SCYLLA_VERSION) RAFT_ENABLED=$(RAFT_ENABLED) make -C testing build down up + @IPV6=$(IPV6) SCYLLA_VERSION=$(SCYLLA_VERSION) RAFT_SCHEMA=$(RAFT_SCHEMA) RAFT_TOPOLOGY=$(RAFT_TOPOLOGY) TABLETS=$(TABLETS) make -C testing build down up .PHONY: dev-env-status dev-env-status: ## Checks status of docker containers and cluster nodes diff --git a/testing/Makefile b/testing/Makefile index 56d9e92150..b5eeb49258 100644 --- a/testing/Makefile +++ b/testing/Makefile @@ -12,7 +12,8 @@ CURRENT_GID := $(shell id -g) SCYLLA_VERSION?=scylla:5.4.1 IP_FAMILY?=IPV4 -RAFT_ENABLED?=true +RAFT_SCHEMA?=true +RAFT_TOPOLOGY?=false TABLETS?=false SKIP_GOSSIP?=false @@ -55,7 +56,7 @@ build: ## Build custom docker image .PHONY: up up: ## Start docker containers up: - @echo "==> Starting testing env with SCYLLA_VERSION=$(SCYLLA_VERSION) and IP_FAMILY=$(IP_FAMILY) and RAFT_ENABLED=$(RAFT_ENABLED) and TABLETS=$(TABLETS)" + @echo "==> Starting testing env with SCYLLA_VERSION=$(SCYLLA_VERSION) and IP_FAMILY=$(IP_FAMILY) and RAFT_SCHEMA=$(RAFT_SCHEMA) and RAFT_TOPOLOGY=$(RAFT_TOPOLOGY) and TABLETS=$(TABLETS)" # Scylla bootstap proceedure have requirements that leads us to follow certain recipe: # 1. Spin up first node on the cluster # 2. Spin up and join other seed node, which is first node from DC2 @@ -72,12 +73,17 @@ else @cp scylla/config/scylla-second-cluster.yaml scylla/scylla-second-cluster.yaml @cp scylla/config/cqlshrc scylla/cqlshrc endif -ifeq ($(RAFT_ENABLED),false) +ifeq ($(RAFT_SCHEMA),false) @$(YQ) write -i scylla/scylla.yaml 'consistent_cluster_management' false + @$(YQ) write -i scylla/scylla-second-cluster.yaml 'consistent_cluster_management' false endif -ifeq ($(TABLETS),true) +ifeq ($(RAFT_TOPOLOGY),true) @$(YQ) write -i scylla/scylla.yaml 'experimental_features[+]' consistent-topology-changes + @$(YQ) write -i scylla/scylla-second-cluster.yaml 'experimental_features[+]' consistent-topology-changes +endif +ifeq ($(TABLETS),true) @$(YQ) write -i scylla/scylla.yaml 'experimental_features[+]' tablets + @$(YQ) write -i scylla/scylla-second-cluster.yaml 'experimental_features[+]' tablets endif ifeq ($(SKIP_GOSSIP),true) @$(YQ) write -i scylla/scylla.yaml 'skip_wait_for_gossip_to_settle' 0