diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ee1f248..f8d1f30 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -16,7 +16,7 @@ on: jobs: goreleaser: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/dockerhub-description.yml b/.github/workflows/dockerhub-description.yml index 5eebea5..79195c4 100644 --- a/.github/workflows/dockerhub-description.yml +++ b/.github/workflows/dockerhub-description.yml @@ -8,7 +8,7 @@ on: - .github/workflows/dockerhub-description.yml jobs: description: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 2ec5283..35de7df 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,7 +10,7 @@ on: jobs: build: name: Lint Test and Build - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: uses: actions/checkout@v4 diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8c78b7a..221b19f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -8,7 +8,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: uses: actions/checkout@v4 @@ -31,9 +31,9 @@ jobs: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true needs: [build] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: - max-parallel: 1 + max-parallel: 4 matrix: gemini-features: ["basic", "normal"] gemini-concurrency: [4] @@ -49,6 +49,10 @@ jobs: id: scylla shell: bash run: | + ulimit -n 65536 + sudo sysctl -w fs.aio-max-nr=30000000 + sudo sysctl -w fs.file-max=30000000 + chmod +x ./bin/gemini make scylla-setup \ SCYLLA_TEST_VERSION=${{ matrix.test-scylla-version }} \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 54ca2d8..c3d7912 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ permissions: jobs: goreleaser: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/Makefile b/Makefile index 90393d4..73c5e95 100644 --- a/Makefile +++ b/Makefile @@ -95,6 +95,10 @@ setup: $(GOBIN)/golangci-lint scylla-setup debug-build scylla-setup: @docker compose -f docker/docker-compose-$(DOCKER_COMPOSE_TESTING).yml up -d + until docker logs gemini-oracle 2>&1 | grep "Starting listening for CQL clients" > /dev/null; do sleep 0.2; done + until docker logs gemini-test 2>&1 | grep "Starting listening for CQL clients" > /dev/null; do sleep 0.2; done + + .PHONY: scylla-shutdown scylla-shutdown: @docker compose -f docker/docker-compose-$(DOCKER_COMPOSE_TESTING).yml down --volumes