@@ -17,9 +17,6 @@ Parse_Arguments() {
17
17
--env_Info)
18
18
env_Info
19
19
;;
20
- --SetGopath)
21
- setGopath
22
- ;;
23
20
--pull_Docker_Images)
24
21
pull_Docker_Images
25
22
;;
@@ -29,9 +26,12 @@ Parse_Arguments() {
29
26
--clean_Environment)
30
27
clean_Environment
31
28
;;
32
- --byfn_eyfn_Tests)
29
+ --byfn_eyfn_Tests)
33
30
byfn_eyfn_Tests
34
31
;;
32
+ --fabcar_Tests)
33
+ fabcar_Tests
34
+ ;;
35
35
--pull_Thirdparty_Images)
36
36
pull_Thirdparty_Images
37
37
;;
@@ -54,23 +54,19 @@ function clearContainers () {
54
54
}
55
55
56
56
function removeUnwantedImages() {
57
- DOCKER_IMAGES_SNAPSHOTS=$( docker images | grep snapshot | grep -v grep | awk ' {print $1":" $2}' )
58
57
59
- if [ -z " $DOCKER_IMAGES_SNAPSHOTS " ] || [ " $DOCKER_IMAGES_SNAPSHOTS " = " " ]; then
60
- echo " ---- No snapshot images available for deletion ----"
61
- else
62
- docker rmi -f $DOCKER_IMAGES_SNAPSHOTS || true
63
- fi
64
- DOCKER_IMAGE_IDS=$( docker images | grep -v ' base*\|couchdb\|kafka\|zookeeper\|cello' | awk ' {print $3}' )
58
+ for i in $( docker images | grep none | awk ' {print $3}' ) ; do
59
+ docker rmi ${i} ;
60
+ done
65
61
66
- if [ -z " $DOCKER_IMAGE_IDS " ] || [ " $DOCKER_IMAGE_IDS " = " " ]; then
67
- echo " ---- No images available for deletion ----"
68
- else
69
- docker rmi -f $DOCKER_IMAGE_IDS || true
70
- docker images
71
- fi
62
+ for i in $( docker images | grep -vE " .*baseimage.*(0.4.13|0.4.14)" | grep -vE " .*baseos.*(0.4.13|0.4.14)" | grep -vE " .*couchdb.*(0.4.13|0.4.14)" | grep -vE " .*zoo.*(0.4.13|0.4.14)" | grep -vE " .*kafka.*(0.4.13|0.4.14)" | grep -v " REPOSITORY" | awk ' {print $1":" $2}' ) ; do
63
+ docker rmi ${i} ;
64
+ done
72
65
}
73
66
67
+ # Remove /tmp/fabric-shim
68
+ docker run -v /tmp:/tmp library/alpine rm -rf /tmp/fabric-shim || true
69
+
74
70
# remove tmp/hfc and hfc-key-store data
75
71
rm -rf /home/jenkins/.nvm /home/jenkins/npm /tmp/fabric-shim /tmp/hfc* /tmp/npm* /home/jenkins/kvsTemp /home/jenkins/.hfc-key-store
76
72
@@ -128,7 +124,7 @@ pull_Docker_Images() {
128
124
exit 1
129
125
fi
130
126
docker tag $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG $ORG_NAME -$IMAGES
131
- docker tag $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG $ORG_NAME -$IMAGES :$IMAGE_TAG
127
+ docker tag $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG $ORG_NAME -$IMAGES :$ARCH - $VERSION
132
128
docker rmi -f $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG
133
129
done
134
130
echo
@@ -146,16 +142,25 @@ pull_Fabric_CA_Image() {
146
142
exit 1
147
143
fi
148
144
docker tag $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG $ORG_NAME -$IMAGES
149
- docker tag $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG $ORG_NAME -$IMAGES :$IMAGE_TAG
145
+ docker tag $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG $ORG_NAME -$IMAGES :$ARCH - $VERSION
150
146
docker rmi -f $NEXUS_URL /$ORG_NAME -$IMAGES :$IMAGE_TAG
151
147
done
152
148
echo
153
149
docker images | grep hyperledger/fabric-ca
154
150
}
151
+
155
152
# run byfn,eyfn tests
156
153
byfn_eyfn_Tests () {
157
- echo
158
- echo " -----------> Execute Byfn and Eyfn Tests"
159
- ./byfn_eyfn.sh
154
+ echo
155
+ echo " -----------> Execute Byfn and Eyfn Tests"
156
+ ./byfn_eyfn.sh
157
+ }
158
+ # run fabcar tests
159
+ fabcar_Tests () {
160
+ echo
161
+ echo " npm version ------> $( npm -v) "
162
+ echo " node version ------> $( node -v) "
163
+ echo " -----------> Execute FabCar Tests"
164
+ ./fabcar.sh
160
165
}
161
166
Parse_Arguments $@
0 commit comments