Skip to content

Commit 54511da

Browse files
OsamaRab3OsamaRab3
committed
update test-04 to verify MySQL db instead of PostgreSQL
Signed-off-by: OsamaRab3 <osrab3@gmail.com>
1 parent d981ac3 commit 54511da

13 files changed

+75
-45
lines changed

‎e2e-network/docker/test-04-v3-snapshot-ccaas.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ networkUp
5151

5252
# check if all nodes are ready
5353
waitForContainer "orderer0.group1.orderer.example.com" "Starting Raft node channel=my-channel1"
54-
waitForContainer "db.ca.org1.example.com" "database system is ready to accept connections"
54+
waitForContainer "db.ca.org1.example.com" "ready for connections"
5555
waitForContainer "ca.org1.example.com" "Listening on https://0.0.0.0:7054"
5656
waitForContainer "couchdb.peer0.org1.example.com" "Apache CouchDB has started. Time to relax."
5757
waitForContainer "peer0.org1.example.com" "Joining gossip network of channel my-channel1 with 1 organizations"

‎e2e/__snapshots__/extendConfig.test.ts.snap‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9216,7 +9216,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
92169216
"address": "ca.org1.example.com",
92179217
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
92189218
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9219-
"db": "postgres",
9219+
"db": "mysql",
92209220
"exposePort": 7040,
92219221
"fullAddress": "ca.org1.example.com:7054",
92229222
"port": 7054,
@@ -9358,7 +9358,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
93589358
"address": "ca.org1.example.com",
93599359
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
93609360
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9361-
"db": "postgres",
9361+
"db": "mysql",
93629362
"exposePort": 7040,
93639363
"fullAddress": "ca.org1.example.com:7054",
93649364
"port": 7054,
@@ -9447,7 +9447,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
94479447
"address": "ca.org1.example.com",
94489448
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
94499449
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9450-
"db": "postgres",
9450+
"db": "mysql",
94519451
"exposePort": 7040,
94529452
"fullAddress": "ca.org1.example.com:7054",
94539453
"port": 7054,
@@ -9547,7 +9547,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
95479547
"address": "ca.org1.example.com",
95489548
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
95499549
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9550-
"db": "postgres",
9550+
"db": "mysql",
95519551
"exposePort": 7040,
95529552
"fullAddress": "ca.org1.example.com:7054",
95539553
"port": 7054,
@@ -9689,7 +9689,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
96899689
"address": "ca.org1.example.com",
96909690
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
96919691
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9692-
"db": "postgres",
9692+
"db": "mysql",
96939693
"exposePort": 7040,
96949694
"fullAddress": "ca.org1.example.com:7054",
96959695
"port": 7054,
@@ -9778,7 +9778,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
97789778
"address": "ca.org1.example.com",
97799779
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
97809780
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9781-
"db": "postgres",
9781+
"db": "mysql",
97829782
"exposePort": 7040,
97839783
"fullAddress": "ca.org1.example.com:7054",
97849784
"port": 7054,
@@ -9877,7 +9877,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
98779877
"address": "ca.org1.example.com",
98789878
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
98799879
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
9880-
"db": "postgres",
9880+
"db": "mysql",
98819881
"exposePort": 7040,
98829882
"fullAddress": "ca.org1.example.com:7054",
98839883
"port": 7054,
@@ -10019,7 +10019,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1001910019
"address": "ca.org1.example.com",
1002010020
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1002110021
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10022-
"db": "postgres",
10022+
"db": "mysql",
1002310023
"exposePort": 7040,
1002410024
"fullAddress": "ca.org1.example.com:7054",
1002510025
"port": 7054,
@@ -10105,7 +10105,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1010510105
"address": "ca.org1.example.com",
1010610106
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1010710107
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10108-
"db": "postgres",
10108+
"db": "mysql",
1010910109
"exposePort": 7040,
1011010110
"fullAddress": "ca.org1.example.com:7054",
1011110111
"port": 7054,
@@ -10247,7 +10247,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1024710247
"address": "ca.org1.example.com",
1024810248
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1024910249
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10250-
"db": "postgres",
10250+
"db": "mysql",
1025110251
"exposePort": 7040,
1025210252
"fullAddress": "ca.org1.example.com:7054",
1025310253
"port": 7054,
@@ -10490,7 +10490,7 @@ exports[`extend config samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json
1049010490
"address": "ca.org1.example.com",
1049110491
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1049210492
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
10493-
"db": "postgres",
10493+
"db": "mysql",
1049410494
"exposePort": 7040,
1049510495
"fullAddress": "ca.org1.example.com:7054",
1049610496
"port": 7054,
@@ -12505,7 +12505,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1250512505
"address": "ca.org1.example.com",
1250612506
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1250712507
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
12508-
"db": "postgres",
12508+
"db": "mysql",
1250912509
"exposePort": 7040,
1251012510
"fullAddress": "ca.org1.example.com:7054",
1251112511
"port": 7054,
@@ -12647,7 +12647,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1264712647
"address": "ca.org1.example.com",
1264812648
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1264912649
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
12650-
"db": "postgres",
12650+
"db": "mysql",
1265112651
"exposePort": 7040,
1265212652
"fullAddress": "ca.org1.example.com:7054",
1265312653
"port": 7054,
@@ -12736,7 +12736,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1273612736
"address": "ca.org1.example.com",
1273712737
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1273812738
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
12739-
"db": "postgres",
12739+
"db": "mysql",
1274012740
"exposePort": 7040,
1274112741
"fullAddress": "ca.org1.example.com:7054",
1274212742
"port": 7054,
@@ -12836,7 +12836,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1283612836
"address": "ca.org1.example.com",
1283712837
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1283812838
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
12839-
"db": "postgres",
12839+
"db": "mysql",
1284012840
"exposePort": 7040,
1284112841
"fullAddress": "ca.org1.example.com:7054",
1284212842
"port": 7054,
@@ -12978,7 +12978,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1297812978
"address": "ca.org1.example.com",
1297912979
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1298012980
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
12981-
"db": "postgres",
12981+
"db": "mysql",
1298212982
"exposePort": 7040,
1298312983
"fullAddress": "ca.org1.example.com:7054",
1298412984
"port": 7054,
@@ -13067,7 +13067,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1306713067
"address": "ca.org1.example.com",
1306813068
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1306913069
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13070-
"db": "postgres",
13070+
"db": "mysql",
1307113071
"exposePort": 7040,
1307213072
"fullAddress": "ca.org1.example.com:7054",
1307313073
"port": 7054,
@@ -13166,7 +13166,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1316613166
"address": "ca.org1.example.com",
1316713167
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1316813168
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13169-
"db": "postgres",
13169+
"db": "mysql",
1317013170
"exposePort": 7040,
1317113171
"fullAddress": "ca.org1.example.com:7054",
1317213172
"port": 7054,
@@ -13308,7 +13308,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1330813308
"address": "ca.org1.example.com",
1330913309
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1331013310
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13311-
"db": "postgres",
13311+
"db": "mysql",
1331213312
"exposePort": 7040,
1331313313
"fullAddress": "ca.org1.example.com:7054",
1331413314
"port": 7054,
@@ -13394,7 +13394,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1339413394
"address": "ca.org1.example.com",
1339513395
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1339613396
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13397-
"db": "postgres",
13397+
"db": "mysql",
1339813398
"exposePort": 7040,
1339913399
"fullAddress": "ca.org1.example.com:7054",
1340013400
"port": 7054,
@@ -13536,7 +13536,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1353613536
"address": "ca.org1.example.com",
1353713537
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1353813538
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13539-
"db": "postgres",
13539+
"db": "mysql",
1354013540
"exposePort": 7040,
1354113541
"fullAddress": "ca.org1.example.com:7054",
1354213542
"port": 7054,
@@ -13779,7 +13779,7 @@ exports[`extend config samples/invalid-fablo-config.json 1`] = `
1377913779
"address": "ca.org1.example.com",
1378013780
"caAdminNameVar": "ORG1_CA_ADMIN_NAME",
1378113781
"caAdminPassVar": "ORG1_CA_ADMIN_PASSWORD",
13782-
"db": "postgres",
13782+
"db": "mysql",
1378313783
"exposePort": 7040,
1378413784
"fullAddress": "ca.org1.example.com:7054",
1378513785
"port": 7054,

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode-peer-dev-mode.json.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3465,7 +3465,7 @@ __createSnapshot() {
34653465
for node in $(__getCAMySQLNodes); do
34663466
echo "Saving state of $node (MySQL)..."
34673467
mkdir -p "$backup_dir/$node/mysql-data"
3468-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
3468+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
34693469
done
34703470
34713471
for node in $(__getOrdererAndPeerNodes); do

‎e2e/__snapshots__/fablo-config-hlf2-1org-1chaincode.json.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3526,7 +3526,7 @@ __createSnapshot() {
35263526
for node in $(__getCAMySQLNodes); do
35273527
echo "Saving state of $node (MySQL)..."
35283528
mkdir -p "$backup_dir/$node/mysql-data"
3529-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
3529+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
35303530
done
35313531
35323532
for node in $(__getOrdererAndPeerNodes); do

‎e2e/__snapshots__/fablo-config-hlf2-1org-2chaincode-raft-ccaas.json.test.ts.snap‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ exports[`samples/fablo-config-hlf3-1org-2chaincode-raft-ccaas.json should create
2727
"domain": "org1.example.com"
2828
},
2929
"ca": {
30-
"db": "postgres"
30+
"db": "mysql"
3131
},
3232
"peer": {
3333
"instances": 1,
@@ -2181,8 +2181,8 @@ services:
21812181
- FABRIC_LOGGING_SPEC=\${LOGGING_LEVEL}
21822182
- FABRIC_CA_SERVER_TLS_ENABLED=true
21832183
- FABRIC_CA_SERVER_DB_TLS_ENABLED=false
2184-
- FABRIC_CA_SERVER_DB_TYPE=postgres
2185-
- FABRIC_CA_SERVER_DB_DATASOURCE=host=db.ca.org1.example.com port=5432 user=postgres password=caDbPass12345 dbname=fabriccaserver sslmode=disable
2184+
- FABRIC_CA_SERVER_DB_TYPE=mysql
2185+
- FABRIC_CA_SERVER_DB_DATASOURCE=root:caDbPass12345@tcp(db.ca.org1.example.com:3306)/fabriccaserver?parseTime=true
21862186
ports:
21872187
- 7040:7054
21882188
working_dir: /etc/hyperledger/fabric-ca-server
@@ -2198,18 +2198,19 @@ services:
21982198
21992199
db.ca.org1.example.com:
22002200
container_name: db.ca.org1.example.com
2201-
image: postgres:\${FABRIC_CA_POSTGRES_VERSION}
2201+
image: mysql:\${FABRIC_CA_MYSQL_VERSION:-5.7}
2202+
command: --sql_mode=""
22022203
environment:
2203-
- POSTGRES_PASSWORD=caDbPass12345
2204-
- POSTGRES_USER=postgres
2205-
- POSTGRES_DB=fabriccaserver
2204+
- MYSQL_ROOT_PASSWORD=caDbPass12345
2205+
- MYSQL_DATABASE=fabriccaserver
22062206
healthcheck:
2207-
test: "pg_isready -h localhost -p 5432 -q -U postgres"
2207+
test: ["CMD", "sh", "-c", "MYSQL_PWD=$$MYSQL_ROOT_PASSWORD mysql -h localhost -u root -e 'SELECT 1' fabriccaserver"]
22082208
interval: 5s
22092209
timeout: 10s
2210-
retries: 7
2210+
retries: 10
2211+
start_period: 10s
22112212
volumes:
2212-
- /var/lib/postgresql/data
2213+
- /var/lib/mysql
22132214
networks:
22142215
- basic
22152216
@@ -3673,12 +3674,12 @@ __getCASQLiteNodes() {
36733674
36743675
__getCAPostgresNodes() {
36753676
echo "
3676-
db.ca.org1.example.com
36773677
"
36783678
}
36793679
36803680
__getCAMySQLNodes() {
36813681
echo "
3682+
db.ca.org1.example.com
36823683
"
36833684
}
36843685
@@ -3709,7 +3710,7 @@ __createSnapshot() {
37093710
for node in $(__getCAMySQLNodes); do
37103711
echo "Saving state of $node (MySQL)..."
37113712
mkdir -p "$backup_dir/$node/mysql-data"
3712-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
3713+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
37133714
done
37143715
37153716
for node in $(__getOrdererAndPeerNodes); do
@@ -3825,7 +3826,7 @@ classDef subgraph_padding fill:none,stroke:none
38253826
subgraph org1_example_com [Organization: Org1<br>org1.example.com]
38263827
subgraph org1_example_com_padding [ ]
38273828
direction RL
3828-
ca_org1_example_com([ca.org1.example.com<br>postgres])
3829+
ca_org1_example_com([ca.org1.example.com<br>mysql])
38293830
peer0_org1_example_com[peer0.org1.example.com<br>CouchDb]
38303831
end
38313832
class org1_example_com_padding subgraph_padding

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-private-data.yaml.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4483,7 +4483,7 @@ __createSnapshot() {
44834483
for node in $(__getCAMySQLNodes); do
44844484
echo "Saving state of $node (MySQL)..."
44854485
mkdir -p "$backup_dir/$node/mysql-data"
4486-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
4486+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
44874487
done
44884488
44894489
for node in $(__getOrdererAndPeerNodes); do

‎e2e/__snapshots__/fablo-config-hlf2-2orgs-2chaincodes-raft.yaml.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6445,7 +6445,7 @@ __createSnapshot() {
64456445
for node in $(__getCAMySQLNodes); do
64466446
echo "Saving state of $node (MySQL)..."
64476447
mkdir -p "$backup_dir/$node/mysql-data"
6448-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
6448+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
64496449
done
64506450
64516451
for node in $(__getOrdererAndPeerNodes); do

‎e2e/__snapshots__/fablo-config-hlf2-3orgs-1chaincode-raft-explorer.json.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7045,7 +7045,7 @@ __createSnapshot() {
70457045
for node in $(__getCAMySQLNodes); do
70467046
echo "Saving state of $node (MySQL)..."
70477047
mkdir -p "$backup_dir/$node/mysql-data"
7048-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
7048+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
70497049
done
70507050
70517051
for node in $(__getOrdererAndPeerNodes); do

‎e2e/__snapshots__/fablo-config-hlf3-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3923,7 +3923,7 @@ __createSnapshot() {
39233923
for node in $(__getCAMySQLNodes); do
39243924
echo "Saving state of $node (MySQL)..."
39253925
mkdir -p "$backup_dir/$node/mysql-data"
3926-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
3926+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
39273927
done
39283928
39293929
for node in $(__getOrdererAndPeerNodes); do

‎e2e/__snapshots__/fablo-config-hlf3-bft-1orgs-1chaincode.json.test.ts.snap‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3948,7 +3948,7 @@ __createSnapshot() {
39483948
for node in $(__getCAMySQLNodes); do
39493949
echo "Saving state of $node (MySQL)..."
39503950
mkdir -p "$backup_dir/$node/mysql-data"
3951-
docker exec "$node" mysqldump -u root -p "$MYSQL_ROOT_PASSWORD" --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
3951+
docker exec -e MYSQL_PWD=caDbPass12345 "$node" mysqldump -u root --add-drop-database --databases fabriccaserver >"$backup_dir/$node/fabriccaserver.sql"
39523952
done
39533953
39543954
for node in $(__getOrdererAndPeerNodes); do

0 commit comments

Comments
 (0)