From 62f177fca14c2bc1da0a3c2eaaebeac15c791de7 Mon Sep 17 00:00:00 2001 From: Dusan Malusev Date: Thu, 12 Dec 2024 02:01:35 +0100 Subject: [PATCH 1/3] fix(integration-tests): increase fs.aio-max-nr and fs.file-max Signed-off-by: Dusan Malusev --- .github/workflows/integration-tests.yml | 4 ++++ Makefile | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 8c78b7a..088509b 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -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/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 From 43fede8223b55baece2ec6543c20e74d4f912abd Mon Sep 17 00:00:00 2001 From: Dusan Malusev Date: Thu, 12 Dec 2024 02:03:48 +0100 Subject: [PATCH 2/3] fix(integration-tests): run integration tests in parallel Signed-off-by: Dusan Malusev --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 088509b..89c7f2f 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -33,7 +33,7 @@ jobs: needs: [build] runs-on: ubuntu-latest strategy: - max-parallel: 1 + max-parallel: 4 matrix: gemini-features: ["basic", "normal"] gemini-concurrency: [4] From 1157b2c6ae980f4da6dd4d036bcafac82f9cf514 Mon Sep 17 00:00:00 2001 From: Dusan Malusev Date: Thu, 12 Dec 2024 02:05:20 +0100 Subject: [PATCH 3/3] improvement(github-actions): run always on ubuntu 24.04 Signed-off-by: Dusan Malusev --- .github/workflows/docker.yml | 2 +- .github/workflows/dockerhub-description.yml | 2 +- .github/workflows/go.yml | 2 +- .github/workflows/integration-tests.yml | 4 ++-- .github/workflows/release.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) 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 89c7f2f..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,7 +31,7 @@ jobs: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true needs: [build] - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 strategy: max-parallel: 4 matrix: 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