Skip to content

Commit bc57d44

Browse files
ArtemkaaasArtemkaaas
committed
Fixed comments related to Pipeline
Signed-off-by: artem.ivanov <[email protected]>
1 parent 082c43a commit bc57d44

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

‎Jenkinsfile.cd‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
174174
sh "RUST_BACKTRACE=1 cargo test --release --no-run"
175175

176176
echo "${env_name} Libindy Test: Run tests"
177-
sh "RUST_BACKTRACE=1 RUST_LOG=indy::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release"
177+
sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release"
178178

179179
if (stashBuildResults) {
180180
stash includes: 'target/release/libindy.so,target/release/libindy.a', name: 'LibindyUbuntuBuildResult'
@@ -197,7 +197,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
197197
testEnv.inside("--ip=\"10.0.0.3\" --network=${network_name}") {
198198
echo "${env_name} Libindy Test: Test java wrapper"
199199

200-
sh "RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
200+
sh "RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
201201
}
202202
}
203203

@@ -208,7 +208,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
208208

209209
sh '''
210210
python3.5 -m pip install --user -e .
211-
LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
211+
LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
212212
'''
213213
}
214214
}
@@ -225,7 +225,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
225225
}
226226
}
227227

228-
if (env_name == 'Ubuntu') {
228+
if (env_name == 'Ubuntu') { // TODO: Delete condition IS-702
229229
sh "cp libnullpay/target/release/libnullpay.so cli"
230230
sh "cp libindy/target/release/libindy.so cli"
231231
dir('cli') {
@@ -237,7 +237,7 @@ def linuxTesting(file, env_name, network_name, stashBuildResults) {
237237
sh 'LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --release --features "nullpay_plugin" --no-run'
238238

239239
echo "${env_name} Indy Cli Test: Run tests"
240-
sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release --features "nullpay_plugin"'
240+
sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --release --features "nullpay_plugin"'
241241

242242
if (stashBuildResults) {
243243
stash includes: 'target/release/indy-cli', name: 'IndyCliUbuntuBuildResult'
@@ -289,7 +289,7 @@ def windowsTesting() {
289289
echo "Windows Libindy Test: Run tests"
290290
withEnv([
291291
"RUST_TEST_THREADS=1",
292-
"RUST_LOG=indy::,zmq=trace",
292+
"RUST_LOG=indy::=debug,zmq=trace",
293293
"TEST_POOL_IP=$INDY_SDK_SERVER_IP"
294294
]) {
295295
bat "cargo test --release"
@@ -301,7 +301,6 @@ def windowsTesting() {
301301
dir('libnullpay') {
302302
echo "Windows Libnullpay Test: Build"
303303
withEnv([
304-
"PROFILE=release",
305304
"RUST_BACKTRACE=1"
306305
]) {
307306
bat "cargo build --release"
@@ -319,7 +318,6 @@ def windowsTesting() {
319318

320319
echo "Windows Indy Cli Test: Build"
321320
withEnv([
322-
"PROFILE=release",
323321
"RUST_BACKTRACE=1"
324322
]) {
325323
bat "cargo build --release"
@@ -330,7 +328,7 @@ def windowsTesting() {
330328
echo "Windows Indy Cli Test: Run tests"
331329
withEnv([
332330
"RUST_TEST_THREADS=1",
333-
"RUST_LOG=indy::,zmq=trace",
331+
"RUST_LOG=indy::=debug,zmq=trace",
334332
"TEST_POOL_IP=$INDY_SDK_SERVER_IP"
335333
]) {
336334
bat "cargo test --release $featuresArgs"

‎Jenkinsfile.ci‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def windowsTesting() {
5151
echo "Windows Libindy Test: Run tests"
5252
withEnv([
5353
"RUST_TEST_THREADS=1",
54-
"RUST_LOG=indy::,zmq=trace",
54+
"RUST_LOG=indy::=debug,zmq=trace",
5555
"TEST_POOL_IP=$INDY_SDK_SERVER_IP"
5656
]) {
5757
bat "cargo test"
@@ -62,7 +62,6 @@ def windowsTesting() {
6262
dir('libnullpay') {
6363
echo "Windows Libnullpay Test: Build"
6464
withEnv([
65-
"PROFILE=debug",
6665
"RUST_BACKTRACE=1"
6766
]) {
6867
bat "cargo build"
@@ -78,15 +77,14 @@ def windowsTesting() {
7877

7978
echo "Windows Indy Cli Test: Build"
8079
withEnv([
81-
"PROFILE=debug",
8280
"RUST_BACKTRACE=1"
8381
]) {
8482
bat "cargo test $featuresArgs --no-run"
8583

8684
echo "Windows Indy Cli Test: Run tests"
8785
withEnv([
8886
"RUST_TEST_THREADS=1",
89-
"RUST_LOG=indy::,zmq=trace",
87+
"RUST_LOG=indy::=debug,zmq=trace",
9088
"TEST_POOL_IP=$INDY_SDK_SERVER_IP"
9189
]) {
9290
bat "cargo test $featuresArgs"
@@ -253,7 +251,7 @@ def linuxTesting(file, env_name, network_name) {
253251
sh "RUST_BACKTRACE=1 cargo test --no-run"
254252

255253
echo "${env_name} Libindy Test: Run tests"
256-
sh "RUST_BACKTRACE=1 RUST_LOG=indy::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test"
254+
sh "RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test"
257255
}
258256
}
259257
},
@@ -296,7 +294,7 @@ def linuxJavaTesting(env_name, network_name, testEnv) {
296294
testEnv.inside("--network=${network_name}") {
297295
echo "${env_name} Libindy Test: Test java wrapper"
298296

299-
sh "RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
297+
sh "RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 mvn clean test"
300298
}
301299
}
302300
}
@@ -309,14 +307,14 @@ def linuxPythonTesting(env_name, network_name, testEnv) {
309307

310308
sh '''
311309
python3.5 -m pip install --user -e .
312-
LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
310+
LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_LOG=indy::=debug,zmq=trace TEST_POOL_IP=10.0.0.2 python3.5 -m pytest
313311
'''
314312
}
315313
}
316314
}
317315

318316
def linuxCLITesting(env_name, network_name, testEnv) {
319-
if (env_name == "RedHat"){
317+
if (env_name == "RedHat"){ // TODO: Delete it IS-702
320318
return;
321319
}
322320

@@ -329,7 +327,7 @@ def linuxCLITesting(env_name, network_name, testEnv) {
329327
sh 'LIBRARY_PATH=./ RUST_BACKTRACE=1 cargo test --features "nullpay_plugin" --no-run'
330328

331329
echo "${env_name} Indy Cli Test: Run tests"
332-
sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --features "nullpay_plugin"'
330+
sh 'LD_LIBRARY_PATH=./:${LD_LIBRARY_PATH} RUST_BACKTRACE=1 RUST_LOG=indy::=debug,zmq=trace RUST_TEST_THREADS=1 TEST_POOL_IP=10.0.0.2 cargo test --features "nullpay_plugin"'
333331
}
334332
}
335333
}

0 commit comments

Comments
 (0)