Skip to content

Commit 0a7d6e1

Browse files
committed
Debugging CI
Signed-off-by: Jakub Dzikowski <jakub.t.dzikowski@gmail.com>
1 parent c64ccbf commit 0a7d6e1

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

.github/workflows/test-on-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
e2e-network/docker/test-04-snapshot.sh.tmpdir/fablo-target/**/*
172172
173173
test-05-v3:
174-
needs: test-main
174+
# needs: test-main
175175
runs-on: ubuntu-latest
176176
steps:
177177
- name: Check out repository code

src/setup-docker/templates/fabric-docker/scripts/cli/channel_fns-v3.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ createChannelAndJoin() {
2121

2222
mkdir "$DIR_NAME" && cd "$DIR_NAME"
2323

24-
2524
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb .
2625

2726
osnadmin channel join --channelID "${CHANNEL_NAME}" --config-block ./"$CHANNEL_NAME".pb -o "${ORDERER_URL}"
28-
rm -rf "$DIR_NAME"
27+
cd .. && rm -rf "$DIR_NAME"
2928
}
3029

3130
createChannelAndJoinTls() {
@@ -48,6 +47,8 @@ createChannelAndJoinTls() {
4847
if [ ! -d "$DIR_NAME" ]; then
4948
mkdir "$DIR_NAME"
5049
cp /var/hyperledger/cli/config/"$CHANNEL_NAME".pb "$DIR_NAME"
50+
chmod a+rw "$DIR_NAME/$CHANNEL_NAME.pb"
51+
ls -l "$DIR_NAME"
5152
fi
5253

5354
osnadmin channel join \
@@ -58,16 +59,14 @@ createChannelAndJoinTls() {
5859
--client-key "${ADMIN_TLS_PRIVATE_KEY}" \
5960
--ca-file "${TLS_CA_CERT_PATH}"
6061

61-
rm -rf "$DIR_NAME"
62+
cd .. && rm -rf "$DIR_NAME"
6263
}
6364

6465
fetchChannelAndJoin() {
6566
local CHANNEL_NAME=$1
66-
6767
local CORE_PEER_LOCALMSPID=$2
6868
local CORE_PEER_ADDRESS=$3
6969
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
70-
7170
local ORDERER_URL=$5
7271

7372
local DIR_NAME=step-fetchChannelAndJoin-$CHANNEL_NAME-$CORE_PEER_ADDRESS
@@ -83,12 +82,11 @@ fetchChannelAndJoin() {
8382
peer channel fetch newest -c "${CHANNEL_NAME}" --orderer "${ORDERER_URL}"
8483
peer channel join -b "${CHANNEL_NAME}"_newest.block
8584

86-
rm -rf "$DIR_NAME"
85+
cd .. && rm -rf "$DIR_NAME"
8786
}
8887

8988
fetchChannelAndJoinTls() {
9089
local CHANNEL_NAME=$1
91-
9290
local CORE_PEER_LOCALMSPID=$2
9391
local CORE_PEER_ADDRESS=$3
9492
local CORE_PEER_MSPCONFIGPATH=$(realpath "$4")
@@ -117,5 +115,5 @@ fetchChannelAndJoinTls() {
117115
peer channel fetch newest -c "${CHANNEL_NAME}" --orderer "${ORDERER_URL}" --tls --cafile "$TLS_CA_CERT_PATH"
118116
peer channel join -b "${CHANNEL_NAME}"_newest.block --tls --cafile "$TLS_CA_CERT_PATH"
119117

120-
rm -rf "$DIR_NAME"
118+
cd .. && rm -rf "$DIR_NAME"
121119
}

0 commit comments

Comments
 (0)