Skip to content

Commit bb56cae

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

File tree

5 files changed

+188
-189
lines changed

5 files changed

+188
-189
lines changed

‎.github/workflows/test_on_push.yaml‎

Lines changed: 172 additions & 153 deletions
Original file line numberDiff line numberDiff line change
@@ -5,151 +5,161 @@ on:
55
pull_request:
66

77
jobs:
8-
run-tests-ce:
9-
if: |
10-
github.event_name == 'push' ||
11-
github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
12-
strategy:
13-
fail-fast: false
14-
matrix:
15-
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"
25-
- tarantool-version: "3.3"
26-
- tarantool-version: "master"
27-
runs-on: ubuntu-22.04
28-
steps:
29-
- uses: actions/checkout@v4
30-
31-
- name: Setup Tarantool CE (1.x, 2.x)
32-
if: ${{ startsWith( matrix.tarantool-version, '1.' ) || startsWith( matrix.tarantool-version, '2.' ) }}
33-
uses: tarantool/setup-tarantool@v4
34-
with:
35-
tarantool-version: ${{ matrix.tarantool-version }}
36-
37-
- name: Setup tt
38-
run: |
39-
curl -L https://tarantool.io/release/2/installer.sh | sudo bash
40-
sudo apt install -y tt
41-
tt version
42-
43-
- name: Cache Tarantool 3.x
44-
if: ${{ startsWith( matrix.tarantool-version, '3.' ) }}
45-
id: cache-v3
46-
uses: actions/cache@v4
47-
with:
48-
path: "${GITHUB_WORKSPACE}/bin"
49-
key: cache-${{ matrix.tarantool-version }}
50-
51-
- name: Setup Tarantool CE (3.x)
52-
if: ${{ startsWith( matrix.tarantool-version, '3.' ) && steps.cache-latest.outputs.cache-hit != 'true' }}
53-
run: |
54-
tt init
55-
tt install tarantool ${{ matrix.tarantool-version }}
56-
57-
- name: Get Tarantool master latest commit
58-
if: matrix.tarantool-version == 'master'
59-
run: |
60-
commit_hash=$(git ls-remote https://github.com/tarantool/tarantool.git --branch master | head -c 8)
61-
echo "LATEST_COMMIT=${commit_hash}" >> $GITHUB_ENV
62-
shell: bash
63-
64-
- name: Cache Tarantool master
65-
if: matrix.tarantool-version == 'master'
66-
id: cache-latest
67-
uses: actions/cache@v4
68-
with:
69-
path: "${GITHUB_WORKSPACE}/bin"
70-
key: cache-latest-${{ env.LATEST_COMMIT }}
71-
72-
- name: Setup Tarantool CE (master)
73-
if: matrix.tarantool-version == 'master' && steps.cache-latest.outputs.cache-hit != 'true'
74-
run: |
75-
tt init
76-
tt install tarantool master
77-
78-
- name: Add tt Tarantool to PATH
79-
if: ${{ startsWith( matrix.tarantool-version, '3.' ) || matrix.tarantool-version == 'master' }}
80-
run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH
81-
82-
- name: Install requirements for community
83-
run: |
84-
tarantool --version
85-
./deps.sh
86-
87-
- name: Install metrics
88-
if: matrix.metrics-version != ''
89-
run: tt rocks install metrics ${{ matrix.metrics-version }}
90-
91-
- name: Install external tuple-merger
92-
if: matrix.external-tuple-merger-version != ''
93-
run: tt rocks install tuple-merger ${{ matrix.external-tuple-merger-version }}
94-
95-
- name: Install external tuple-keydef
96-
if: matrix.external-tuple-keydef-version != ''
97-
run: tt rocks install tuple-keydef ${{ matrix.external-tuple-keydef-version }}
98-
99-
# This server starts and listen on 8084 port that is used for tests
100-
- name: Stop Mono server
101-
run: sudo kill -9 $(sudo lsof -t -i tcp:8084) || true
102-
103-
- run: cmake -S . -B build
104-
env:
105-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106-
107-
- name: Run tests
108-
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
117-
118-
- name: Run tests with coverage and send results to coveralls.io
119-
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
8+
# run-tests-ce:
9+
# if: |
10+
# github.event_name == 'push' ||
11+
# github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
12+
# strategy:
13+
# fail-fast: false
14+
# tarantool-version: [ "1.10.6", "1.10", "2.8", "2.10", "2.11" ]
15+
# cartridge-version: [ "2.16.3" ]
16+
# external-tuple-merger-version: [ "" ]
17+
# external-tuple-keydef-version: [ "" ]
18+
# matrix:
19+
# include:
20+
## - tarantool-version: "2.10"
21+
## - tarantool-version: "2.11"
22+
## coveralls: true
23+
## - tarantool-version: "2.11"
24+
## external-tuple-merger-version: "0.0.5"
25+
## external-tuple-keydef-version: "0.0.4"
26+
## - tarantool-version: "3.0"
27+
## - tarantool-version: "3.1"
28+
## - tarantool-version: "3.2"
29+
# - tarantool-version: "3.3"
30+
## - tarantool-version: "master"
31+
# runs-on: ubuntu-22.04
32+
# steps:
33+
# - uses: actions/checkout@v4
34+
#
35+
# - name: Setup Tarantool CE (1.x, 2.x)
36+
# if: ${{ startsWith( matrix.tarantool-version, '1.' ) || startsWith( matrix.tarantool-version, '2.' ) }}
37+
# uses: tarantool/setup-tarantool@v4
38+
# with:
39+
# tarantool-version: ${{ matrix.tarantool-version }}
40+
#
41+
# - name: Setup tt
42+
# run: |
43+
# curl -L https://tarantool.io/release/2/installer.sh | sudo bash
44+
# sudo apt install -y tt
45+
# tt version
46+
#
47+
# - name: Cache Tarantool 3.x
48+
# if: ${{ startsWith( matrix.tarantool-version, '3.' ) }}
49+
# id: cache-v3
50+
# uses: actions/cache@v4
51+
# with:
52+
# path: "${GITHUB_WORKSPACE}/bin"
53+
# key: cache-${{ matrix.tarantool-version }}
54+
#
55+
# - name: Setup Tarantool CE (3.x)
56+
# if: ${{ startsWith( matrix.tarantool-version, '3.' ) && steps.cache-latest.outputs.cache-hit != 'true' }}
57+
# run: |
58+
# tt init
59+
# tt install tarantool ${{ matrix.tarantool-version }}
60+
#
61+
# - name: Get Tarantool master latest commit
62+
# if: matrix.tarantool-version == 'master'
63+
# run: |
64+
# commit_hash=$(git ls-remote https://github.com/tarantool/tarantool.git --branch master | head -c 8)
65+
# echo "LATEST_COMMIT=${commit_hash}" >> $GITHUB_ENV
66+
# shell: bash
67+
#
68+
# - name: Cache Tarantool master
69+
# if: matrix.tarantool-version == 'master'
70+
# id: cache-latest
71+
# uses: actions/cache@v4
72+
# with:
73+
# path: "${GITHUB_WORKSPACE}/bin"
74+
# key: cache-latest-${{ env.LATEST_COMMIT }}
75+
#
76+
# - name: Setup Tarantool CE (master)
77+
# if: matrix.tarantool-version == 'master' && steps.cache-latest.outputs.cache-hit != 'true'
78+
# run: |
79+
# tt init
80+
# tt install tarantool master
81+
#
82+
# - name: Add tt Tarantool to PATH
83+
# if: ${{ startsWith( matrix.tarantool-version, '3.' ) || matrix.tarantool-version == 'master' }}
84+
# run: echo "${GITHUB_WORKSPACE}/bin" >> $GITHUB_PATH
85+
#
86+
# - name: Install requirements for community
87+
# run: |
88+
# tarantool --version
89+
# ./deps.sh
90+
#
91+
# - name: Install metrics
92+
# if: matrix.metrics-version != ''
93+
# run: tt rocks install metrics ${{ matrix.metrics-version }}
94+
#
95+
# - name: Install external tuple-merger
96+
# if: matrix.external-tuple-merger-version != ''
97+
# run: tt rocks install tuple-merger ${{ matrix.external-tuple-merger-version }}
98+
#
99+
# - name: Install external tuple-keydef
100+
# if: matrix.external-tuple-keydef-version != ''
101+
# run: tt rocks install tuple-keydef ${{ matrix.external-tuple-keydef-version }}
102+
#
103+
# # This server starts and listen on 8084 port that is used for tests
104+
# - name: Stop Mono server
105+
# run: sudo kill -9 $(sudo lsof -t -i tcp:8084) || true
106+
#
107+
# - run: cmake -S . -B build
108+
# env:
109+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
110+
#
111+
# - name: Run tests
112+
# if: matrix.coveralls != true # See https://github.com/actions/runner/issues/1173
113+
# uses: nick-fields/retry@v3
114+
# with:
115+
# max_attempts: 3
116+
# retry_on: error
117+
# retry_wait_seconds: 10
118+
# timeout_minutes: 40
119+
# command: |
120+
# make -C build luatest-no-coverage
121+
#
122+
# - name: Run tests with coverage and send results to coveralls.io
123+
# if: ${{ matrix.coveralls }}
124+
# uses: nick-fields/retry@v3
125+
# with:
126+
# max_attempts: 3
127+
# retry_on: error
128+
# retry_wait_seconds: 10
129+
# timeout_minutes: 40
130+
# command: |
131+
# make -C build coveralls
128132

129133
run-tests-ee:
130134
if: github.event_name == 'push'
131135
strategy:
132-
fail-fast: false
133136
matrix:
134-
include:
135-
- tarantool-version:
136-
folder: "2.10"
137-
bundle: "tarantool-enterprise-sdk-gc64-2.10.8-0-r691.linux.x86_64"
137+
tarantool-version:
138138
- tarantool-version:
139-
folder: "2.11"
140-
bundle: "tarantool-enterprise-sdk-gc64-2.11.7-0-r691.linux.x86_64"
139+
folder: "2.10"
140+
bundle: "tarantool-enterprise-sdk-gc64-2.10.8-0-r691.linux.x86_64"
141+
- folder: "2.11"
142+
bundle: "tarantool-enterprise-sdk-gc64-2.11.7-0-r691.linux.x86_64"
143+
metrics-version: [ "", "1.5.0" ]
144+
cartridge-version: [ "2.16.3" ]
145+
include:
141146
- tarantool-version:
142147
folder: "3.2"
143148
bundle: "tarantool-enterprise-sdk-gc64-3.2.0-0-r40.linux.x86_64"
144149
- tarantool-version:
145150
folder: "3.3"
146-
bundle: "tarantool-enterprise-sdk-gc64-3.3.2-0-r62.linux.x86_64"
151+
bundle: "tarantool-enterprise-sdk-gc64-3.3.3-0-r70.linux.x86_64"
147152
- tarantool-version:
148153
folder: "3.4"
149-
bundle: "tarantool-enterprise-sdk-gc64-3.4.0-0-r62.linux.x86_64"
154+
bundle: "tarantool-enterprise-sdk-gc64-3.4.1-0-r70.linux.x86_64"
155+
- tarantool-version:
156+
folder: "3.5"
157+
bundle: "tarantool-enterprise-sdk-gc64-3.5.0-0-r70.linux.x86_64"
158+
159+
fail-fast: false
150160
runs-on: ubuntu-22.04
151161
steps:
152-
- uses: actions/checkout@v4
162+
- uses: actions/checkout@master
153163

154164
- name: Install requirements for enterprise
155165
run: |
@@ -160,6 +170,9 @@ jobs:
160170
source tarantool-enterprise/env.sh
161171
tarantool --version
162172
./deps.sh
173+
env:
174+
CARTRIDGE_VERSION: ${{ matrix.cartridge-version }}
175+
VSHARD_VERSION: ${{ matrix.vshard-version }}
163176

164177
- name: Install metrics
165178
if: matrix.metrics-version != ''
@@ -175,30 +188,40 @@ jobs:
175188
- run: cmake -S . -B build
176189

177190
- 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
191+
run: make -C build luatest-no-coverage
186192

187193
run-perf-tests-ce:
188194
if: |
189195
github.event_name == 'push' ||
190196
github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
191197
strategy:
192-
fail-fast: false
193198
matrix:
194-
tarantool-version: [ "2.10", "2.11", "3.0", "3.1", "3.2", "3.3", "master" ]
195-
runs-on: ubuntu-22.04
199+
tarantool-version: [ "2.10", "2.11" ]
200+
metrics-version: [ "1.1.0" ]
201+
cartridge-version: [ "2.16.3" ]
202+
include:
203+
- tarantool-version: "3.0"
204+
vshard-version: "0.1.36"
205+
- tarantool-version: "3.1"
206+
vshard-version: "0.1.36"
207+
- tarantool-version: "3.2"
208+
vshard-version: "0.1.36"
209+
- tarantool-version: "3.3"
210+
vshard-version: "0.1.36"
211+
- tarantool-version: "3.4"
212+
vshard-version: "0.1.36"
213+
- tarantool-version: "3.5"
214+
vshard-version: "0.1.36"
215+
- tarantool-version: "master"
216+
vshard-version: "0.1.36"
217+
fail-fast: false
218+
runs-on: ubuntu-20.04
196219
steps:
197-
- uses: actions/checkout@v4
220+
- uses: actions/checkout@master
198221

199222
- name: Setup Tarantool CE (1.x, 2.x)
200223
if: ${{ startsWith( matrix.tarantool-version, '1.' ) || startsWith( matrix.tarantool-version, '2.' ) }}
201-
uses: tarantool/setup-tarantool@v4
224+
uses: tarantool/setup-tarantool@v2
202225
with:
203226
tarantool-version: ${{ matrix.tarantool-version }}
204227

@@ -211,7 +234,7 @@ jobs:
211234
- name: Cache Tarantool 3.x
212235
if: ${{ startsWith( matrix.tarantool-version, '3.' ) }}
213236
id: cache-v3
214-
uses: actions/cache@v4
237+
uses: actions/cache@v3
215238
with:
216239
path: "${GITHUB_WORKSPACE}/bin"
217240
key: cache-${{ matrix.tarantool-version }}
@@ -232,7 +255,7 @@ jobs:
232255
- name: Cache Tarantool master
233256
if: matrix.tarantool-version == 'master'
234257
id: cache-latest
235-
uses: actions/cache@v4
258+
uses: actions/cache@v3
236259
with:
237260
path: "${GITHUB_WORKSPACE}/bin"
238261
key: cache-latest-${{ env.LATEST_COMMIT }}
@@ -251,6 +274,9 @@ jobs:
251274
run: |
252275
tarantool --version
253276
./deps.sh
277+
env:
278+
CARTRIDGE_VERSION: ${{ matrix.cartridge-version }}
279+
VSHARD_VERSION: ${{ matrix.vshard-version }}
254280

255281
- name: Install metrics
256282
if: matrix.metrics-version != ''
@@ -263,11 +289,4 @@ jobs:
263289
- run: cmake -S . -B build
264290

265291
- 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
292+
run: make -C build performance

0 commit comments

Comments
 (0)