Skip to content

Commit 195515c

Browse files
vakhovvakhov
committed
test: remove skip for vshard config support
1 parent 667083a commit 195515c

File tree

5 files changed

+82
-81
lines changed

5 files changed

+82
-81
lines changed

‎.github/workflows/test_on_push.yaml‎

Lines changed: 64 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,36 @@ jobs:
1212
strategy:
1313
fail-fast: false
1414
matrix:
15+
tarantool-version: [ "2.10", "2.11" ]
16+
metrics-version: [ "" ]
17+
cartridge-version: [ "2.16.3" ]
18+
external-tuple-merger-version: [ "" ]
19+
external-tuple-keydef-version: [ "" ]
1520
include:
16-
- tarantool-version: "2.10"
1721
- tarantool-version: "2.11"
1822
coveralls: true
23+
metrics-version: "1.1.0"
24+
cartridge-version: "2.16.3"
25+
- tarantool-version: "2.11"
26+
metrics-version: "1.1.0"
27+
vshard-version: "0.1.36"
1928
- tarantool-version: "2.11"
2029
external-tuple-merger-version: "0.0.5"
2130
external-tuple-keydef-version: "0.0.4"
2231
- tarantool-version: "3.0"
32+
vshard-version: "0.1.36"
2333
- tarantool-version: "3.1"
34+
vshard-version: "0.1.36"
2435
- tarantool-version: "3.2"
36+
vshard-version: "0.1.36"
2537
- tarantool-version: "3.3"
38+
vshard-version: "0.1.36"
39+
- tarantool-version: "3.4"
40+
vshard-version: "0.1.36"
41+
- tarantool-version: "3.5"
42+
vshard-version: "0.1.36"
2643
- tarantool-version: "master"
44+
vshard-version: "0.1.36"
2745
runs-on: ubuntu-22.04
2846
steps:
2947
- uses: actions/checkout@v4
@@ -83,6 +101,9 @@ jobs:
83101
run: |
84102
tarantool --version
85103
./deps.sh
104+
env:
105+
CARTRIDGE_VERSION: ${{ matrix.cartridge-version }}
106+
VSHARD_VERSION: ${{ matrix.vshard-version }}
86107

87108
- name: Install metrics
88109
if: matrix.metrics-version != ''
@@ -106,47 +127,38 @@ jobs:
106127

107128
- name: Run tests
108129
if: matrix.coveralls != true # See https://github.com/actions/runner/issues/1173
109-
uses: nick-fields/retry@v3
110-
with:
111-
max_attempts: 3
112-
retry_on: error
113-
retry_wait_seconds: 10
114-
timeout_minutes: 40
115-
command: |
116-
make -C build luatest-no-coverage
130+
run: make -C build luatest-no-coverage
117131

118132
- name: Run tests with coverage and send results to coveralls.io
119133
if: ${{ matrix.coveralls }}
120-
uses: nick-fields/retry@v3
121-
with:
122-
max_attempts: 3
123-
retry_on: error
124-
retry_wait_seconds: 10
125-
timeout_minutes: 40
126-
command: |
127-
make -C build coveralls
134+
run: make -C build coveralls
128135

129136
run-tests-ee:
130137
if: github.event_name == 'push'
131138
strategy:
132139
fail-fast: false
133140
matrix:
134-
include:
141+
tarantool-version:
135142
- 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"
143+
folder: "2.10"
144+
bundle: "tarantool-enterprise-sdk-gc64-2.10.8-0-r691.linux.x86_64"
145+
- folder: "2.11"
146+
bundle: "tarantool-enterprise-sdk-gc64-2.11.7-0-r691.linux.x86_64"
147+
metrics-version: [ "", "1.5.0" ]
148+
cartridge-version: [ "2.16.3" ]
149+
include:
141150
- tarantool-version:
142151
folder: "3.2"
143152
bundle: "tarantool-enterprise-sdk-gc64-3.2.0-0-r40.linux.x86_64"
144153
- tarantool-version:
145154
folder: "3.3"
146-
bundle: "tarantool-enterprise-sdk-gc64-3.3.2-0-r62.linux.x86_64"
155+
bundle: "tarantool-enterprise-sdk-gc64-3.3.3-0-r70.linux.x86_64"
147156
- tarantool-version:
148157
folder: "3.4"
149-
bundle: "tarantool-enterprise-sdk-gc64-3.4.0-0-r62.linux.x86_64"
158+
bundle: "tarantool-enterprise-sdk-gc64-3.4.1-0-r70.linux.x86_64"
159+
- tarantool-version:
160+
folder: "3.5"
161+
bundle: "tarantool-enterprise-sdk-gc64-3.5.0-0-r70.linux.x86_64"
150162
runs-on: ubuntu-22.04
151163
steps:
152164
- uses: actions/checkout@v4
@@ -160,6 +172,9 @@ jobs:
160172
source tarantool-enterprise/env.sh
161173
tarantool --version
162174
./deps.sh
175+
env:
176+
CARTRIDGE_VERSION: ${{ matrix.cartridge-version }}
177+
VSHARD_VERSION: ${{ matrix.vshard-version }}
163178

164179
- name: Install metrics
165180
if: matrix.metrics-version != ''
@@ -175,23 +190,33 @@ jobs:
175190
- run: cmake -S . -B build
176191

177192
- 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
193+
run: make -C build luatest-no-coverage
186194

187195
run-perf-tests-ce:
188196
if: |
189197
github.event_name == 'push' ||
190198
github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
191199
strategy:
192-
fail-fast: false
193200
matrix:
194-
tarantool-version: [ "2.10", "2.11", "3.0", "3.1", "3.2", "3.3", "master" ]
201+
tarantool-version: [ "2.10", "2.11" ]
202+
metrics-version: [ "1.1.0" ]
203+
cartridge-version: [ "2.16.3" ]
204+
include:
205+
- tarantool-version: "3.0"
206+
vshard-version: "0.1.36"
207+
- tarantool-version: "3.1"
208+
vshard-version: "0.1.36"
209+
- tarantool-version: "3.2"
210+
vshard-version: "0.1.36"
211+
- tarantool-version: "3.3"
212+
vshard-version: "0.1.36"
213+
- tarantool-version: "3.4"
214+
vshard-version: "0.1.36"
215+
- tarantool-version: "3.5"
216+
vshard-version: "0.1.36"
217+
- tarantool-version: "master"
218+
vshard-version: "0.1.36"
219+
fail-fast: false
195220
runs-on: ubuntu-22.04
196221
steps:
197222
- uses: actions/checkout@v4
@@ -251,6 +276,9 @@ jobs:
251276
run: |
252277
tarantool --version
253278
./deps.sh
279+
env:
280+
CARTRIDGE_VERSION: ${{ matrix.cartridge-version }}
281+
VSHARD_VERSION: ${{ matrix.vshard-version }}
254282

255283
- name: Install metrics
256284
if: matrix.metrics-version != ''
@@ -263,11 +291,4 @@ jobs:
263291
- run: cmake -S . -B build
264292

265293
- 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
294+
run: make -C build performance

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SHELL := /bin/bash
22

3-
S3_TARANTOOL_SDK_3_PATH := s3://packages/enterprise/release/linux/x86_64/3.3/tarantool-enterprise-sdk-gc64-3.3.2-0-r62.linux.x86_64.tar.gz
3+
S3_TARANTOOL_SDK_3_PATH := s3://packages/enterprise/release/linux/x86_64/3.5/tarantool-enterprise-sdk-gc64-3.5.0-0-r70.linux.x86_64.tar.gz
44
S3_TARANTOOL_SDK_2_PATH := s3://packages/enterprise/release/linux/x86_64/2.11/tarantool-enterprise-sdk-gc64-2.11.7-0-r691.linux.x86_64.tar.gz
55
S3_ENDPOINT_URL := $(if $(S3_ENDPOINT_URL),$(S3_ENDPOINT_URL),https://hb.vkcs.cloud)
66

‎deps.sh‎

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
#!/usr/bin/env bash
22
# Call this script to install test dependencies
3+
# Usage examples:
4+
# CARTRIDGE_VERSION=2.16.3 ./deps.sh
5+
# VSHARD_VERSION=0.1.36 ./deps.sh
36

47
set -e
58

@@ -13,37 +16,21 @@ fi
1316
# Test dependencies:
1417
${TTCTL} rocks install luatest 1.0.1
1518
${TTCTL} rocks install luacheck 0.26.0
16-
${TTCTL} rocks install luacov 0.13.0
17-
${TTCTL} rocks install luacov-reporters 0.1.0
1819

19-
# cluacov, luacov-coveralls and dependencies
20-
$TTCTL rocks install https://raw.githubusercontent.com/luarocks/cluacov/master/cluacov-dev-1.rockspec
21-
$TTCTL rocks install https://luarocks.org/manifests/dhkolf/dkjson-2.8-1.rockspec
22-
$TTCTL rocks install https://raw.githubusercontent.com/keplerproject/luafilesystem/master/luafilesystem-scm-1.rockspec
23-
$TTCTL rocks install https://raw.githubusercontent.com/moteus/lua-path/master/rockspecs/lua-path-scm-0.rockspec
24-
25-
# Most of this code is the workaround for
26-
# https://github.com/moteus/luacov-coveralls/pull/30
27-
# Remove it, when the pull request will be merged.
28-
TMPDIR="$(mktemp -d)"
29-
LUACOV_COVERALLS_ROCKSPEC_URL="https://raw.githubusercontent.com/moteus/luacov-coveralls/master/rockspecs/luacov-coveralls-scm-0.rockspec"
30-
LUACOV_COVERALLS_ROCKSPEC_FILE="${TMPDIR}/luacov-coveralls-scm-0.rockspec"
31-
curl -fsSL "${LUACOV_COVERALLS_ROCKSPEC_URL}" > "${LUACOV_COVERALLS_ROCKSPEC_FILE}"
32-
sed -i -e 's@git://@git+https://@' "${LUACOV_COVERALLS_ROCKSPEC_FILE}"
33-
$TTCTL rocks install "${LUACOV_COVERALLS_ROCKSPEC_FILE}"
34-
rm "${LUACOV_COVERALLS_ROCKSPEC_FILE}"
35-
rmdir "${TMPDIR}"
36-
37-
CARTRIDGE_VERSION="${CARTRIDGE_VERSION:-2.16.3}"
38-
VSHARD_VERSION="${VSHARD_VERSION:-0.1.36}"
39-
METRICS_VERSION="${METRICS_VERSION:-1.5.0}"
40-
DDL_VERSION="${METRICS_VERSION:-1.7.1}"
41-
MIGRATIONS_VERSION="${MIGRATIONS_VERSION:-1.1.0}"
20+
if [[ -n "${CARTRIDGE_VERSION}" ]]
21+
then
22+
${TTCTL} rocks install https://raw.githubusercontent.com/luarocks/cluacov/master/cluacov-dev-1.rockspec
23+
${TTCTL} rocks install https://luarocks.org/manifests/dhkolf/dkjson-2.8-1.rockspec
24+
${TTCTL} rocks install https://raw.githubusercontent.com/keplerproject/luafilesystem/master/luafilesystem-scm-1.rockspec
25+
${TTCTL} rocks install https://raw.githubusercontent.com/moteus/lua-path/master/rockspecs/lua-path-scm-0.rockspec
26+
${TTCTL} rocks install luacov-coveralls --only-server=https://luarocks.org/
27+
28+
${TTCTL} rocks install cartridge "${CARTRIDGE_VERSION}"
29+
${TTCTL} rocks install migrations 1.1.0
30+
else
31+
${TTCTL} rocks install vshard "${VSHARD_VERSION:-0.1.36}"
32+
fi
4233

43-
${TTCTL} rocks install cartridge "${CARTRIDGE_VERSION}"
44-
${TTCTL} rocks install vshard "${VSHARD_VERSION}"
45-
${TTCTL} rocks install metrics "${METRICS_VERSION}"
46-
${TTCTL} rocks install ddl "${DDL_VERSION}"
47-
${TTCTL} rocks install migrations "${MIGRATIONS_VERSION}"
34+
${TTCTL} rocks install ddl 1.7.1
4835

4936
${TTCTL} rocks make

‎test/helper.lua‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -957,7 +957,6 @@ 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()
961960

962961
helpers.start_tarantool3_cluster(g, tarantool3_cluster_cfg)
963962
end
@@ -1523,11 +1522,6 @@ function helpers.skip_if_tarantool3_crud_roles_unsupported()
15231522
("Tarantool %s does not support crud roles"):format(version))
15241523
end
15251524

1526-
function helpers.skip_tarantool3_vshard_unsupported()
1527-
t.skip("vshard is not supported in config yet: " ..
1528-
"https://github.com/tarantool/tarantool-ee/issues/815")
1529-
end
1530-
15311525
function helpers.skip_if_not_config_backend(backend)
15321526
t.skip_if(backend ~= helpers.backend.CONFIG, "The test is for Tarantool 3 with config only")
15331527
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)