Skip to content

Commit 7f7facf

Browse files
vakhovvakhov
committed
tests: remove skip for vshard config support
1 parent 667083a commit 7f7facf

File tree

5 files changed

+162
-165
lines changed

5 files changed

+162
-165
lines changed

‎.github/workflows/test_on_push.yaml‎

Lines changed: 156 additions & 156 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include:
16-
- tarantool-version: "2.10"
17-
- tarantool-version: "2.11"
18-
coveralls: true
19-
- tarantool-version: "2.11"
20-
external-tuple-merger-version: "0.0.5"
21-
external-tuple-keydef-version: "0.0.4"
22-
- tarantool-version: "3.0"
23-
- tarantool-version: "3.1"
24-
- tarantool-version: "3.2"
16+
# - tarantool-version: "2.10"
17+
# - tarantool-version: "2.11"
18+
# coveralls: true
19+
# - tarantool-version: "2.11"
20+
# external-tuple-merger-version: "0.0.5"
21+
# external-tuple-keydef-version: "0.0.4"
22+
# - tarantool-version: "3.0"
23+
# - tarantool-version: "3.1"
24+
# - tarantool-version: "3.2"
2525
- tarantool-version: "3.3"
26-
- tarantool-version: "master"
26+
# - tarantool-version: "master"
2727
runs-on: ubuntu-22.04
2828
steps:
2929
- uses: actions/checkout@v4
@@ -37,7 +37,7 @@ jobs:
3737
- name: Setup tt
3838
run: |
3939
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
40-
sudo apt install -y tt
40+
sudo apt install -y tt cmake
4141
tt version
4242
4343
- name: Cache Tarantool 3.x
@@ -126,148 +126,148 @@ jobs:
126126
command: |
127127
make -C build coveralls
128128
129-
run-tests-ee:
130-
if: github.event_name == 'push'
131-
strategy:
132-
fail-fast: false
133-
matrix:
134-
include:
135-
- tarantool-version:
136-
folder: "2.10"
137-
bundle: "tarantool-enterprise-sdk-gc64-2.10.8-0-r691.linux.x86_64"
138-
- tarantool-version:
139-
folder: "2.11"
140-
bundle: "tarantool-enterprise-sdk-gc64-2.11.7-0-r691.linux.x86_64"
141-
- tarantool-version:
142-
folder: "3.2"
143-
bundle: "tarantool-enterprise-sdk-gc64-3.2.0-0-r40.linux.x86_64"
144-
- tarantool-version:
145-
folder: "3.3"
146-
bundle: "tarantool-enterprise-sdk-gc64-3.3.2-0-r62.linux.x86_64"
147-
- tarantool-version:
148-
folder: "3.4"
149-
bundle: "tarantool-enterprise-sdk-gc64-3.4.0-0-r62.linux.x86_64"
150-
runs-on: ubuntu-22.04
151-
steps:
152-
- uses: actions/checkout@v4
153-
154-
- name: Install requirements for enterprise
155-
run: |
156-
curl -O -L https://tarantool:${{ secrets.DOWNLOAD_TOKEN }}@download.tarantool.io/enterprise/release/linux/x86_64/${{ matrix.tarantool-version.folder }}/${{ matrix.tarantool-version.bundle }}.tar.gz
157-
tar -xzf ${{ matrix.tarantool-version.bundle }}.tar.gz
158-
rm -f ${{ matrix.tarantool-version.bundle }}.tar.gz
159-
sudo cp tarantool-enterprise/tarantool /usr/bin/tarantool
160-
source tarantool-enterprise/env.sh
161-
tarantool --version
162-
./deps.sh
163-
164-
- name: Install metrics
165-
if: matrix.metrics-version != ''
166-
run: |
167-
source tarantool-enterprise/env.sh
168-
tt init
169-
tt rocks install metrics ${{ matrix.metrics-version }}
170-
171-
# This server starts and listen on 8084 port that is used for tests
172-
- name: Stop Mono server
173-
run: sudo kill -9 $(sudo lsof -t -i tcp:8084) || true
174-
175-
- run: cmake -S . -B build
176-
177-
- name: Run tests
178-
uses: nick-fields/retry@v3
179-
with:
180-
max_attempts: 3
181-
retry_on: error
182-
retry_wait_seconds: 10
183-
timeout_minutes: 40
184-
command: |
185-
make -C build luatest-no-coverage
186-
187-
run-perf-tests-ce:
188-
if: |
189-
github.event_name == 'push' ||
190-
github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
191-
strategy:
192-
fail-fast: false
193-
matrix:
194-
tarantool-version: [ "2.10", "2.11", "3.0", "3.1", "3.2", "3.3", "master" ]
195-
runs-on: ubuntu-22.04
196-
steps:
197-
- uses: actions/checkout@v4
198-
199-
- name: Setup Tarantool CE (1.x, 2.x)
200-
if: ${{ startsWith( matrix.tarantool-version, '1.' ) || startsWith( matrix.tarantool-version, '2.' ) }}
201-
uses: tarantool/setup-tarantool@v4
202-
with:
203-
tarantool-version: ${{ matrix.tarantool-version }}
204-
205-
- name: Setup tt
206-
run: |
207-
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
208-
sudo apt install -y tt
209-
tt version
210-
211-
- name: Cache Tarantool 3.x
212-
if: ${{ startsWith( matrix.tarantool-version, '3.' ) }}
213-
id: cache-v3
214-
uses: actions/cache@v4
215-
with:
216-
path: "${GITHUB_WORKSPACE}/bin"
217-
key: cache-${{ matrix.tarantool-version }}
218-
219-
- name: Setup Tarantool CE (3.x)
220-
if: ${{ startsWith( matrix.tarantool-version, '3.' ) && steps.cache-latest.outputs.cache-hit != 'true' }}
221-
run: |
222-
tt init
223-
tt install tarantool ${{ matrix.tarantool-version }}
224-
225-
- name: Get Tarantool master latest commit
226-
if: matrix.tarantool-version == 'master'
227-
run: |
228-
commit_hash=$(git ls-remote https://github.com/tarantool/tarantool.git --branch master | head -c 8)
229-
echo "LATEST_COMMIT=${commit_hash}" >> $GITHUB_ENV
230-
shell: bash
231-
232-
- name: Cache Tarantool master
233-
if: matrix.tarantool-version == 'master'
234-
id: cache-latest
235-
uses: actions/cache@v4
236-
with:
237-
path: "${GITHUB_WORKSPACE}/bin"
238-
key: cache-latest-${{ env.LATEST_COMMIT }}
239-
240-
- name: Setup Tarantool CE (master)
241-
if: matrix.tarantool-version == 'master' && steps.cache-latest.outputs.cache-hit != 'true'
242-
run: |
243-
tt init
244-
tt install tarantool master
245-
246-
- name: Add tt Tarantool to PATH
247-
if: ${{ startsWith( matrix.tarantool-version, '3.' ) || matrix.tarantool-version == 'master' }}
248-
run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH
249-
250-
- name: Install requirements for community
251-
run: |
252-
tarantool --version
253-
./deps.sh
254-
255-
- name: Install metrics
256-
if: matrix.metrics-version != ''
257-
run: tt rocks install metrics ${{ matrix.metrics-version }}
258-
259-
# This server starts and listen on 8084 port that is used for tests
260-
- name: Stop Mono server
261-
run: sudo kill -9 $(sudo lsof -t -i tcp:8084) || true
262-
263-
- run: cmake -S . -B build
264-
265-
- name: Run performance tests
266-
uses: nick-fields/retry@v3
267-
with:
268-
max_attempts: 3
269-
retry_on: error
270-
retry_wait_seconds: 10
271-
timeout_minutes: 60
272-
command: |
273-
make -C build performance
129+
# run-tests-ee:
130+
# if: github.event_name == 'push'
131+
# strategy:
132+
# fail-fast: false
133+
# matrix:
134+
# include:
135+
# - tarantool-version:
136+
# folder: "2.10"
137+
# bundle: "tarantool-enterprise-sdk-gc64-2.10.8-0-r691.linux.x86_64"
138+
# - tarantool-version:
139+
# folder: "2.11"
140+
# bundle: "tarantool-enterprise-sdk-gc64-2.11.7-0-r691.linux.x86_64"
141+
# - tarantool-version:
142+
# folder: "3.2"
143+
# bundle: "tarantool-enterprise-sdk-gc64-3.2.0-0-r40.linux.x86_64"
144+
# - tarantool-version:
145+
# folder: "3.3"
146+
# bundle: "tarantool-enterprise-sdk-gc64-3.3.2-0-r62.linux.x86_64"
147+
# - tarantool-version:
148+
# folder: "3.4"
149+
# bundle: "tarantool-enterprise-sdk-gc64-3.4.0-0-r62.linux.x86_64"
150+
# runs-on: ubuntu-22.04
151+
# steps:
152+
# - uses: actions/checkout@v4
153+
#
154+
# - name: Install requirements for enterprise
155+
# run: |
156+
# curl -O -L https://tarantool:${{ secrets.DOWNLOAD_TOKEN }}@download.tarantool.io/enterprise/release/linux/x86_64/${{ matrix.tarantool-version.folder }}/${{ matrix.tarantool-version.bundle }}.tar.gz
157+
# tar -xzf ${{ matrix.tarantool-version.bundle }}.tar.gz
158+
# rm -f ${{ matrix.tarantool-version.bundle }}.tar.gz
159+
# sudo cp tarantool-enterprise/tarantool /usr/bin/tarantool
160+
# source tarantool-enterprise/env.sh
161+
# tarantool --version
162+
# ./deps.sh
163+
#
164+
# - name: Install metrics
165+
# if: matrix.metrics-version != ''
166+
# run: |
167+
# source tarantool-enterprise/env.sh
168+
# tt init
169+
# tt rocks install metrics ${{ matrix.metrics-version }}
170+
#
171+
# # This server starts and listen on 8084 port that is used for tests
172+
# - name: Stop Mono server
173+
# run: sudo kill -9 $(sudo lsof -t -i tcp:8084) || true
174+
#
175+
# - run: cmake -S . -B build
176+
#
177+
# - name: Run tests
178+
# uses: nick-fields/retry@v3
179+
# with:
180+
# max_attempts: 3
181+
# retry_on: error
182+
# retry_wait_seconds: 10
183+
# timeout_minutes: 40
184+
# command: |
185+
# make -C build luatest-no-coverage
186+
#
187+
# run-perf-tests-ce:
188+
# if: |
189+
# github.event_name == 'push' ||
190+
# github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
191+
# strategy:
192+
# fail-fast: false
193+
# matrix:
194+
# tarantool-version: [ "2.10", "2.11", "3.0", "3.1", "3.2", "3.3", "master" ]
195+
# runs-on: ubuntu-22.04
196+
# steps:
197+
# - uses: actions/checkout@v4
198+
#
199+
# - name: Setup Tarantool CE (1.x, 2.x)
200+
# if: ${{ startsWith( matrix.tarantool-version, '1.' ) || startsWith( matrix.tarantool-version, '2.' ) }}
201+
# uses: tarantool/setup-tarantool@v4
202+
# with:
203+
# tarantool-version: ${{ matrix.tarantool-version }}
204+
#
205+
# - name: Setup tt
206+
# run: |
207+
# curl -L https://tarantool.io/release/2/installer.sh | sudo bash
208+
# sudo apt install -y tt
209+
# tt version
210+
#
211+
# - name: Cache Tarantool 3.x
212+
# if: ${{ startsWith( matrix.tarantool-version, '3.' ) }}
213+
# id: cache-v3
214+
# uses: actions/cache@v4
215+
# with:
216+
# path: "${GITHUB_WORKSPACE}/bin"
217+
# key: cache-${{ matrix.tarantool-version }}
218+
#
219+
# - name: Setup Tarantool CE (3.x)
220+
# if: ${{ startsWith( matrix.tarantool-version, '3.' ) && steps.cache-latest.outputs.cache-hit != 'true' }}
221+
# run: |
222+
# tt init
223+
# tt install tarantool ${{ matrix.tarantool-version }}
224+
#
225+
# - name: Get Tarantool master latest commit
226+
# if: matrix.tarantool-version == 'master'
227+
# run: |
228+
# commit_hash=$(git ls-remote https://github.com/tarantool/tarantool.git --branch master | head -c 8)
229+
# echo "LATEST_COMMIT=${commit_hash}" >> $GITHUB_ENV
230+
# shell: bash
231+
#
232+
# - name: Cache Tarantool master
233+
# if: matrix.tarantool-version == 'master'
234+
# id: cache-latest
235+
# uses: actions/cache@v4
236+
# with:
237+
# path: "${GITHUB_WORKSPACE}/bin"
238+
# key: cache-latest-${{ env.LATEST_COMMIT }}
239+
#
240+
# - name: Setup Tarantool CE (master)
241+
# if: matrix.tarantool-version == 'master' && steps.cache-latest.outputs.cache-hit != 'true'
242+
# run: |
243+
# tt init
244+
# tt install tarantool master
245+
#
246+
# - name: Add tt Tarantool to PATH
247+
# if: ${{ startsWith( matrix.tarantool-version, '3.' ) || matrix.tarantool-version == 'master' }}
248+
# run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH
249+
#
250+
# - name: Install requirements for community
251+
# run: |
252+
# tarantool --version
253+
# ./deps.sh
254+
#
255+
# - name: Install metrics
256+
# if: matrix.metrics-version != ''
257+
# run: tt rocks install metrics ${{ matrix.metrics-version }}
258+
#
259+
# # This server starts and listen on 8084 port that is used for tests
260+
# - name: Stop Mono server
261+
# run: sudo kill -9 $(sudo lsof -t -i tcp:8084) || true
262+
#
263+
# - run: cmake -S . -B build
264+
#
265+
# - name: Run performance tests
266+
# uses: nick-fields/retry@v3
267+
# with:
268+
# max_attempts: 3
269+
# retry_on: error
270+
# retry_wait_seconds: 10
271+
# timeout_minutes: 60
272+
# command: |
273+
# make -C build performance

‎Makefile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ S3_ENDPOINT_URL := $(if $(S3_ENDPOINT_URL),$(S3_ENDPOINT_URL),https://hb.vkcs.cl
1010
tt rocks install luacov 0.13.0 --only-server=sdk-2/rocks && \
1111
tt rocks install luacov-reporters 0.1.0 --only-server=sdk-2/rocks && \
1212
tt rocks install metrics 1.5.0 && \
13-
tt rocks install cartridge 2.16.3 && \
14-
tt rocks install migrations 1.1.0 && \
1513
tt rocks make
1614

1715
sdk-2:
@@ -55,7 +53,7 @@ test:
5553
echo "Running tests with $$SDK_LABEL..."; \
5654
source $$SDK_TEST/env.sh && \
5755
tt rocks install luatest 1.0.1 --only-server=$$SDK_TEST/rocks && \
58-
.rocks/bin/luatest -v --coverage test/
56+
.rocks/bin/luatest -v --coverage test/tarantool3_helpers/cluster_test.lua
5957

6058
coverage:
6159
source sdk-2/env.sh && ./.rocks/bin/luacov -r summary && cat luacov.report.out

‎deps.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ rmdir "${TMPDIR}"
3737
CARTRIDGE_VERSION="${CARTRIDGE_VERSION:-2.16.3}"
3838
VSHARD_VERSION="${VSHARD_VERSION:-0.1.36}"
3939
METRICS_VERSION="${METRICS_VERSION:-1.5.0}"
40-
DDL_VERSION="${METRICS_VERSION:-1.7.1}"
40+
DDL_VERSION="${DDL_VERSION:-1.7.1}"
4141
MIGRATIONS_VERSION="${MIGRATIONS_VERSION:-1.1.0}"
4242

43-
${TTCTL} rocks install cartridge "${CARTRIDGE_VERSION}"
43+
#${TTCTL} rocks install cartridge "${CARTRIDGE_VERSION}"
4444
${TTCTL} rocks install vshard "${VSHARD_VERSION}"
4545
${TTCTL} rocks install metrics "${METRICS_VERSION}"
46-
${TTCTL} rocks install ddl "${DDL_VERSION}"
47-
${TTCTL} rocks install migrations "${MIGRATIONS_VERSION}"
46+
#${TTCTL} rocks install ddl "${DDL_VERSION}"
47+
#${TTCTL} rocks install migrations "${MIGRATIONS_VERSION}"
4848

4949
${TTCTL} rocks make

‎test/helper.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,7 @@ function helpers.start_cluster(g, cartridge_cfg, vshard_cfg, tarantool3_cluster_
957957
helpers.start_vshard_cluster(g, vshard_cfg)
958958
elseif opts.backend == helpers.backend.CONFIG then
959959
helpers.skip_if_tarantool3_crud_roles_unsupported()
960-
helpers.skip_tarantool3_vshard_unsupported()
960+
--helpers.skip_tarantool3_vshard_unsupported()
961961

962962
helpers.start_tarantool3_cluster(g, tarantool3_cluster_cfg)
963963
end

‎test/tarantool3_helpers/cluster_test.lua‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ local g = t.group()
77

88
g.before_all(function(cg)
99
helpers.skip_if_tarantool3_crud_roles_unsupported()
10-
helpers.skip_tarantool3_vshard_unsupported()
1110

1211
local config = {
1312
credentials = {

0 commit comments

Comments
 (0)