Skip to content

Commit fe68814

Browse files
ci: bump master EE version
Use SDK with Tarantool which supports auth method in IPROTO_ID response [1]. 1. tarantool/tarantool@13b0ce9 Follows #269
1 parent 2101b10 commit fe68814

File tree

2 files changed

+24
-33
lines changed

2 files changed

+24
-33
lines changed

.github/workflows/testing.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119
path: ''
120120
- bundle: 'bundle-2.10.0-1-gfa775b383-r486-linux-x86_64'
121121
path: ''
122-
- bundle: 'sdk-gc64-2.11.0-entrypoint-107-ga18449d54-r524.linux.x86_64'
122+
- bundle: 'sdk-gc64-2.11.0-entrypoint-113-g803baaffe-r529.linux.x86_64'
123123
path: 'dev/linux/x86_64/master/'
124124
python: ['3.6', '3.7', '3.8', '3.9', '3.10']
125125

@@ -169,7 +169,7 @@ jobs:
169169
make test
170170
env:
171171
TEST_TNT_SSL: ${{ matrix.tarantool.bundle == 'bundle-2.10.0-1-gfa775b383-r486-linux-x86_64' ||
172-
matrix.tarantool.bundle == 'sdk-gc64-2.11.0-entrypoint-107-ga18449d54-r524.linux.x86_64'}}
172+
matrix.tarantool.bundle == 'sdk-gc64-2.11.0-entrypoint-113-g803baaffe-r529.linux.x86_64'}}
173173

174174
run_tests_pip_branch_install_linux:
175175
# We want to run on external PRs, but not on our own internal

test/suites/test_ssl.py

+22-31
Original file line numberDiff line numberDiff line change
@@ -440,15 +440,12 @@ def test_single(self):
440440
server_cert_file=self.cert_file,
441441
server_auth_type=AUTH_TYPE_PAP_SHA256,
442442
client_auth_type=AUTH_TYPE_CHAP_SHA1),
443-
# uncomment after this Tarantool EE SDK will be available on CI:
444-
# tarantool-enterprise-sdk-nogc64-2.11.0-entrypoint-110
445-
#
446-
# SslTestCase(
447-
# name="auth_type_use_server_id",
448-
# ok=True,
449-
# server_key_file=self.key_file,
450-
# server_cert_file=self.cert_file,
451-
# server_auth_type=AUTH_TYPE_PAP_SHA256),
443+
SslTestCase(
444+
name="auth_type_use_server_id",
445+
ok=True,
446+
server_key_file=self.key_file,
447+
server_cert_file=self.cert_file,
448+
server_auth_type=AUTH_TYPE_PAP_SHA256),
452449
]
453450
for t in testcases:
454451
with self.subTest(msg=t.name):
@@ -559,15 +556,12 @@ def test_pool(self):
559556
client_cert_file=self.cert_file,
560557
client_ca_file=self.ca_file,
561558
client_auth_type=AUTH_TYPE_PAP_SHA256),
562-
# uncomment after this Tarantool EE SDK will be available on CI:
563-
# tarantool-enterprise-sdk-nogc64-2.11.0-entrypoint-110
564-
#
565-
# SslTestCase(
566-
# name="auth_type_use_server_id",
567-
# ok=True,
568-
# server_key_file=self.key_file,
569-
# server_cert_file=self.cert_file,
570-
# server_auth_type=AUTH_TYPE_PAP_SHA256),
559+
SslTestCase(
560+
name="auth_type_use_server_id",
561+
ok=True,
562+
server_key_file=self.key_file,
563+
server_cert_file=self.cert_file,
564+
server_auth_type=AUTH_TYPE_PAP_SHA256),
571565
]
572566
for t in testcases:
573567
cnt = 5
@@ -683,19 +677,16 @@ def test_mesh(self):
683677
client_cert_file=self.cert_file,
684678
client_ca_file=self.ca_file,
685679
client_auth_type=AUTH_TYPE_PAP_SHA256),
686-
# uncomment after this Tarantool EE SDK will be available on CI:
687-
# tarantool-enterprise-sdk-nogc64-2.11.0-entrypoint-110
688-
#
689-
# SslTestCase(
690-
# name="auth_type_use_server_id",
691-
# ok=True,
692-
# server_key_file=self.key_file,
693-
# server_cert_file=self.cert_file,
694-
# server_ca_file=self.ca_file,
695-
# server_auth_type=AUTH_TYPE_PAP_SHA256
696-
# client_key_file=self.key_file,
697-
# client_cert_file=self.cert_file,
698-
# client_ca_file=self.ca_file,),
680+
SslTestCase(
681+
name="auth_type_use_server_id",
682+
ok=True,
683+
server_key_file=self.key_file,
684+
server_cert_file=self.cert_file,
685+
server_ca_file=self.ca_file,
686+
server_auth_type=AUTH_TYPE_PAP_SHA256,
687+
client_key_file=self.key_file,
688+
client_cert_file=self.cert_file,
689+
client_ca_file=self.ca_file),
699690
]
700691
for t in testcases:
701692
cnt = 5

0 commit comments

Comments
 (0)