Skip to content

Commit ef7e2d0

Browse files
dkulicdkulic
committed
Merge branch 'feature/fix_query_language_translation_back_to_json' of github.com:dkulic/indy-sdk into feature/fix_query_language_translation_back_to_json
Signed-off-by: Darko Kulic <[email protected]>
2 parents 3deee78 + aadfe4d commit ef7e2d0

File tree

31 files changed

+239
-402
lines changed

31 files changed

+239
-402
lines changed

‎Jenkinsfile.cd‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -454,49 +454,46 @@ def ubuntuPublishing() {
454454

455455
def windowsPublishing() {
456456
def libindyVersion
457-
node('win2016') {
457+
node('ubuntu') {
458458
stage('Publish Libindy Windows Files') {
459-
def ws_path = "workspace/${env.JOB_NAME}".replace(' ', '_')
460-
ws(ws_path) {
461-
try {
462-
echo 'Publish Windows files: Checkout csm'
463-
checkout scm
459+
try {
460+
echo 'Publish Windows files: Checkout csm'
461+
checkout scm
464462

465-
libindyVersion = getSrcVersion("libindy")
463+
libindyVersion = getSrcVersion("libindy")
466464

467-
dir('libindy') {
468-
echo 'Publish Libindy Windows files'
469-
windowsPublishArtifact("libindy", "lib", libindyVersion, "LibindyWindowsBuildResult")
470-
}
465+
echo 'Publish Windows files: Build docker image'
466+
testEnv = dockerHelpers.build('indy-sdk', 'libindy/ci/ubuntu.dockerfile libindy/ci')
471467

472-
dir('cli') {
473-
echo 'Publish Indy Cli Windows files'
474-
windowsPublishArtifact("indy-cli", "executable", libindyVersion, "IndyCliWindowsBuildResult")
475-
}
468+
echo 'Publish Libindy Windows files'
469+
windowsPublishArtifact(testEnv, "libindy", "libindy", "lib", libindyVersion, "LibindyWindowsBuildResult")
476470

477-
dir('libnullpay') {
478-
def libnullpayVersion = getSrcVersion("libnullpay")
471+
echo 'Publish Indy Cli Windows files'
472+
windowsPublishArtifact(testEnv, "cli", "indy-cli", "executable", libindyVersion, "IndyCliWindowsBuildResult")
479473

480-
echo 'Publish Libnullpay Cli Windows files'
481-
windowsPublishArtifact("libnullpay", "lib", libnullpayVersion, "LibnullpayWindowsBuildResult")
482-
}
483-
}
484-
finally {
485-
echo 'Publish Windows files: Cleanup'
486-
cleanWs()
487-
}
474+
def libnullpayVersion = getSrcVersion("libnullpay")
475+
476+
echo 'Publish Libnullpay Cli Windows files'
477+
windowsPublishArtifact(testEnv, "libnullpay", "libnullpay", "lib", libnullpayVersion, "LibnullpayWindowsBuildResult")
478+
}
479+
finally {
480+
echo 'Publish Windows files: Cleanup'
481+
step([$class: 'WsCleanup'])
488482
}
489483
}
490-
cleanWs()
491484
}
492485
return libindyVersion
493486
}
494487

495-
def windowsPublishArtifact(packageName, packageType, packageVersion, stashName) {
496-
unstash name: stashName
488+
def windowsPublishArtifact(testEnv, folder, packageName, packageType, packageVersion, stashName) {
489+
testEnv.inside {
490+
sh 'chmod -R 777 ci'
497491

498-
withCredentials([file(credentialsId: 'SovrinRepoSSHKey', variable: 'repo_key')]) {
499-
sh "../ci/win-zip-and-upload.sh $packageName $packageType $packageVersion '${repo_key}' ${env.BRANCH_NAME} $env.BUILD_NUMBER"
492+
unstash name: stashName
493+
494+
withCredentials([file(credentialsId: 'SovrinRepoSSHKey', variable: 'repo_key')]) {
495+
sh "ci/win-zip-and-upload.sh $folder $packageName $packageType $packageVersion '${repo_key}' master 1"
496+
}
500497
}
501498
}
502499

‎ci/indy-pool.dockerfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sourc
2424

2525
RUN useradd -ms /bin/bash -u $uid indy
2626

27-
ARG indy_plenum_ver=1.2.369
27+
ARG indy_plenum_ver=1.2.389
2828
ARG indy_anoncreds_ver=1.0.32
29-
ARG indy_node_ver=1.3.425
29+
ARG indy_node_ver=1.3.446
3030
ARG python3_indy_crypto_ver=0.4.1
3131
ARG indy_crypto_ver=0.4.0
3232

@@ -38,7 +38,7 @@ RUN apt-get update -y && apt-get install -y \
3838
libindy-crypto=${indy_crypto_ver} \
3939
vim
4040

41-
RUN echo '[supervisord]\n\
41+
RUN echo "[supervisord]\n\
4242
logfile = /tmp/supervisord.log\n\
4343
logfile_maxbytes = 50MB\n\
4444
logfile_backups=10\n\
@@ -56,37 +56,37 @@ childlogdir = /tmp\n\
5656
strip_ansi = false\n\
5757
\n\
5858
[program:node1]\n\
59-
command=start_indy_node Node1 9701 9702\n\
59+
command=start_indy_node Node1 0.0.0.0 9701 0.0.0.0 9702\n\
6060
directory=/home/indy\n\
6161
stdout_logfile=/tmp/node1.log\n\
6262
stderr_logfile=/tmp/node1.log\n\
6363
\n\
6464
[program:node2]\n\
65-
command=start_indy_node Node2 9703 9704\n\
65+
command=start_indy_node Node2 0.0.0.0 9703 0.0.0.0 9704\n\
6666
directory=/home/indy\n\
6767
stdout_logfile=/tmp/node2.log\n\
6868
stderr_logfile=/tmp/node2.log\n\
6969
\n\
7070
[program:node3]\n\
71-
command=start_indy_node Node3 9705 9706\n\
71+
command=start_indy_node Node3 0.0.0.0 9705 0.0.0.0 9706\n\
7272
directory=/home/indy\n\
7373
stdout_logfile=/tmp/node3.log\n\
7474
stderr_logfile=/tmp/node3.log\n\
7575
\n\
7676
[program:node4]\n\
77-
command=start_indy_node Node4 9707 9708\n\
77+
command=start_indy_node Node4 0.0.0.0 9707 0.0.0.0 9708\n\
7878
directory=/home/indy\n\
7979
stdout_logfile=/tmp/node4.log\n\
80-
stderr_logfile=/tmp/node4.log\n'\
80+
stderr_logfile=/tmp/node4.log\n"\
8181
>> /etc/supervisord.conf
8282

8383
USER indy
8484

85-
ARG pool_ip=127.0.0.1
86-
8785
RUN awk '{if (index($1, "NETWORK_NAME") != 0) {print("NETWORK_NAME = \"sandbox\"")} else print($0)}' /etc/indy/indy_config.py> /tmp/indy_config.py
8886
RUN mv /tmp/indy_config.py /etc/indy/indy_config.py
8987

88+
ARG pool_ip=127.0.0.1
89+
9090
RUN generate_indy_pool_transactions --nodes 4 --clients 5 --nodeNum 1 2 3 4 --ips="$pool_ip,$pool_ip,$pool_ip,$pool_ip"
9191

9292
EXPOSE 9701 9702 9703 9704 9705 9706 9707 9708

‎ci/win-zip-and-upload.sh‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,32 @@
11
#!/bin/bash -xe
22

33
if [ "$1" = "--help" ] ; then
4-
echo "Usage: <package> <package_type> <version> <key> <type> <number>"
4+
echo "Usage: <folder> <package> <package_type> <version> <key> <type> <number>"
55
return
66
fi
77

8-
package="$1"
9-
package_type="$2"
10-
version="$3"
11-
key="$4"
12-
type="$5"
13-
number="$6"
8+
folder="$1"
9+
package="$2"
10+
package_type="$3"
11+
version="$4"
12+
key="$5"
13+
type="$6"
14+
number="$7"
1415

15-
[ -z $package ] && exit 1
16-
[ -z $package_type ] && exit 2
17-
[ -z $version ] && exit 3
18-
[ -z $key ] && exit 4
19-
[ -z $type ] && exit 5
20-
[ -z $number ] && exit 6
16+
[ -z $folder ] && exit 1
17+
[ -z $package ] && exit 2
18+
[ -z $package_type ] && exit 3
19+
[ -z $version ] && exit 4
20+
[ -z $key ] && exit 5
21+
[ -z $type ] && exit 6
22+
[ -z $number ] && exit 7
2123

2224
TEMP_ARCH_DIR=./${package}-zip
2325
mkdir ${TEMP_ARCH_DIR}
2426

2527
if [ ${package_type} = "lib" ] ; then
2628
mkdir ${TEMP_ARCH_DIR}/lib
27-
cp -r ./include ${TEMP_ARCH_DIR}
29+
cp -r ${folder}/include ${TEMP_ARCH_DIR}
2830
cp ./target/release/*.dll ${TEMP_ARCH_DIR}/lib/
2931
elif [ ${package_type} = "executable" ] ; then
3032
cp ./target/release/*.dll ${TEMP_ARCH_DIR}/
@@ -33,7 +35,8 @@ else
3335
exit 2
3436
fi
3537

36-
powershell.exe -nologo -noprofile -command "& { Add-Type -A 'System.IO.Compression.FileSystem'; [IO.Compression.ZipFile]::CreateFromDirectory('${TEMP_ARCH_DIR}', '${package}_${version}.zip'); }"
38+
cd ${TEMP_ARCH_DIR} && zip -r ${package}_${version}.zip ./* && mv ${package}_${version}.zip .. && cd ..
39+
3740
rm -rf ${TEMP_ARCH_DIR}
3841

3942
cat <<EOF | sftp -v -oStrictHostKeyChecking=no -i $key [email protected]

‎cli/docker_pool_transactions_genesis‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{"data":{"alias":"Node1","blskey":"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba","client_ip":"10.0.0.2","client_port":9702,"node_ip":"10.0.0.2","node_port":9701,"services":["VALIDATOR"]},"dest":"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv","identifier":"Th7MpTaRZVRYnPiabds81Y","txnId":"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62","type":"0"}
2-
{"data":{"alias":"Node2","blskey":"37rAPpXVoxzKhz7d9gkUe52XuXryuLXoM6P6LbWDB7LSbG62Lsb33sfG7zqS8TK1MXwuCHj1FKNzVpsnafmqLG1vXN88rt38mNFs9TENzm4QHdBzsvCuoBnPH7rpYYDo9DZNJePaDvRvqJKByCabubJz3XXKbEeshzpz4Ma5QYpJqjk","client_ip":"10.0.0.2","client_port":9704,"node_ip":"10.0.0.2","node_port":9703,"services":["VALIDATOR"]},"dest":"8ECVSk179mjsjKRLWiQtssMLgp6EPhWXtaYyStWPSGAb","identifier":"EbP4aYNeTHL6q385GuVpRV","txnId":"1ac8aece2a18ced660fef8694b61aac3af08ba875ce3026a160acbc3a3af35fc","type":"0"}
3-
{"data":{"alias":"Node3","blskey":"3WFpdbg7C5cnLYZwFZevJqhubkFALBfCBBok15GdrKMUhUjGsk3jV6QKj6MZgEubF7oqCafxNdkm7eswgA4sdKTRc82tLGzZBd6vNqU8dupzup6uYUf32KTHTPQbuUM8Yk4QFXjEf2Usu2TJcNkdgpyeUSX42u5LqdDDpNSWUK5deC5","client_ip":"10.0.0.2","client_port":9706,"node_ip":"10.0.0.2","node_port":9705,"services":["VALIDATOR"]},"dest":"DKVxG2fXXTU8yT5N7hGEbXB3dfdAnYv1JczDUHpmDxya","identifier":"4cU41vWW82ArfxJxHkzXPG","txnId":"7e9f355dffa78ed24668f0e0e369fd8c224076571c51e2ea8be5f26479edebe4","type":"0"}
4-
{"data":{"alias":"Node4","blskey":"2zN3bHM1m4rLz54MJHYSwvqzPchYp8jkHswveCLAEJVcX6Mm1wHQD1SkPYMzUDTZvWvhuE6VNAkK3KxVeEmsanSmvjVkReDeBEMxeDaayjcZjFGPydyey1qxBHmTvAnBKoPydvuTAqx5f7YNNRAdeLmUi99gERUU7TD8KfAa6MpQ9bw","client_ip":"10.0.0.2","client_port":9708,"node_ip":"10.0.0.2","node_port":9707,"services":["VALIDATOR"]},"dest":"4PS3EDQ3dW1tci1Bp6543CfuuebjFrg36kLAUcskGfaA","identifier":"TWwCRQRZ2ZHMJFn9TzLp7W","txnId":"aa5e817d7cc626170eca175822029339a444eb0ee8f0bd20d3b0b76e566fb008","type":"0"}
1+
{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node1","blskey":"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba","client_ip":"10.0.0.2","client_port":9702,"node_ip":"10.0.0.2","node_port":9701,"services":["VALIDATOR"]},"dest":"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv"},"metadata":{"from":"Th7MpTaRZVRYnPiabds81Y"},"type":"0"},"txnMetadata":{"seqNo":1,"txnId":"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62"},"ver":"1"}
2+
{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node2","blskey":"37rAPpXVoxzKhz7d9gkUe52XuXryuLXoM6P6LbWDB7LSbG62Lsb33sfG7zqS8TK1MXwuCHj1FKNzVpsnafmqLG1vXN88rt38mNFs9TENzm4QHdBzsvCuoBnPH7rpYYDo9DZNJePaDvRvqJKByCabubJz3XXKbEeshzpz4Ma5QYpJqjk","client_ip":"10.0.0.2","client_port":9704,"node_ip":"10.0.0.2","node_port":9703,"services":["VALIDATOR"]},"dest":"8ECVSk179mjsjKRLWiQtssMLgp6EPhWXtaYyStWPSGAb"},"metadata":{"from":"EbP4aYNeTHL6q385GuVpRV"},"type":"0"},"txnMetadata":{"seqNo":2,"txnId":"1ac8aece2a18ced660fef8694b61aac3af08ba875ce3026a160acbc3a3af35fc"},"ver":"1"}
3+
{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node3","blskey":"3WFpdbg7C5cnLYZwFZevJqhubkFALBfCBBok15GdrKMUhUjGsk3jV6QKj6MZgEubF7oqCafxNdkm7eswgA4sdKTRc82tLGzZBd6vNqU8dupzup6uYUf32KTHTPQbuUM8Yk4QFXjEf2Usu2TJcNkdgpyeUSX42u5LqdDDpNSWUK5deC5","client_ip":"10.0.0.2","client_port":9706,"node_ip":"10.0.0.2","node_port":9705,"services":["VALIDATOR"]},"dest":"DKVxG2fXXTU8yT5N7hGEbXB3dfdAnYv1JczDUHpmDxya"},"metadata":{"from":"4cU41vWW82ArfxJxHkzXPG"},"type":"0"},"txnMetadata":{"seqNo":3,"txnId":"7e9f355dffa78ed24668f0e0e369fd8c224076571c51e2ea8be5f26479edebe4"},"ver":"1"}
4+
{"reqSignature":{},"txn":{"data":{"data":{"alias":"Node4","blskey":"2zN3bHM1m4rLz54MJHYSwvqzPchYp8jkHswveCLAEJVcX6Mm1wHQD1SkPYMzUDTZvWvhuE6VNAkK3KxVeEmsanSmvjVkReDeBEMxeDaayjcZjFGPydyey1qxBHmTvAnBKoPydvuTAqx5f7YNNRAdeLmUi99gERUU7TD8KfAa6MpQ9bw","client_ip":"10.0.0.2","client_port":9708,"node_ip":"10.0.0.2","node_port":9707,"services":["VALIDATOR"]},"dest":"4PS3EDQ3dW1tci1Bp6543CfuuebjFrg36kLAUcskGfaA"},"metadata":{"from":"TWwCRQRZ2ZHMJFn9TzLp7W"},"type":"0"},"txnMetadata":{"seqNo":4,"txnId":"aa5e817d7cc626170eca175822029339a444eb0ee8f0bd20d3b0b76e566fb008"},"ver":"1"}

0 commit comments

Comments
 (0)