diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b0f1141cc2518ca6ce036ae4cfd24a9e517b084b..922d878ee1d439c782591241030cc9ec9ee5c2a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,6 @@ variables: DL_URL_FRAG: jobs/artifacts/master/raw/release SERVER_URL: ${REPOS_API}server/$DL_URL_FRAG/server.linux64?job=build CLIENT_URL: ${REPOS_API}client/$DL_URL_FRAG/client.linux64?job=build - CHANNELBOT_URL: ${REPOS_API}channelbot/$DL_URL_FRAG/channelbot.linux64?job=build UDB_URL: ${REPOS_API}user-discovery-bot/$DL_URL_FRAG/udb.linux64?job=build GATEWAY_URL: ${REPOS_API}gateway/$DL_URL_FRAG/gateway.linux64?job=build @@ -47,13 +46,12 @@ installbinaries: stage: installbinaries image: $DOCKER_IMAGE script: + - mkdir -p ~/.elixxir - mkdir -p bin - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/server $SERVER_URL" - chmod +x bin/server - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/client $CLIENT_URL" - chmod +x bin/client - - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/channelbot $CHANNELBOT_URL" - - chmod +x bin/channelbot - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/udb $UDB_URL" - chmod +x bin/udb - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/gateway $GATEWAY_URL" @@ -61,7 +59,6 @@ installbinaries: - echo $PWD - bin/server --version - bin/client --version - - bin/channelbot --version - bin/udb --version - bin/gateway --version artifacts: @@ -73,6 +70,7 @@ basice2e: stage: basice2e image: $DOCKER_IMAGE script: + - mkdir -p ~/.elixxir - echo $PWD - cd basice2e - ./run.sh diff --git a/basice2e/clients.goldoutput/client45.out b/basice2e/clients.goldoutput/client45.out index ee33c10bc58ab1288bbd605883fe1de80e8c6f8a..4c9f492c40825a1aab361e2eff482fbada98f1ff 100644 --- a/basice2e/clients.goldoutput/client45.out +++ b/basice2e/clients.goldoutput/client45.out @@ -1,5 +1,4 @@ Sending Message to 5, Ben: Hello, 5 -Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello Message from 7, Rick Received: Hello, 4 Sending Message to 5, Ben: Hello, 5 Message from 7, Rick Received: Hello, 4 diff --git a/basice2e/clients.goldoutput/client56.out b/basice2e/clients.goldoutput/client56.out index 51958982bff8591d5bf477f9ced9202de9e18066..7a98704087bcdb93c3e0d54f56cd424d4a2b0684 100644 --- a/basice2e/clients.goldoutput/client56.out +++ b/basice2e/clients.goldoutput/client56.out @@ -1,5 +1,4 @@ Sending Message to 6, Steph: Hello, 6 -Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello Message from 4, Jim Received: Hello, 5 Sending Message to 6, Steph: Hello, 6 Message from 4, Jim Received: Hello, 5 diff --git a/basice2e/clients.goldoutput/client67.out b/basice2e/clients.goldoutput/client67.out index 6a43c177a29a58be86989754397ffb013b01c04b..0fba43b551bd29359354396c249dd4a7da993df8 100644 --- a/basice2e/clients.goldoutput/client67.out +++ b/basice2e/clients.goldoutput/client67.out @@ -1,5 +1,4 @@ Sending Message to 7, Rick: Hello, 7 -Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello Message from 5, Ben Received: Hello, 6 Sending Message to 7, Rick: Hello, 7 Message from 5, Ben Received: Hello, 6 diff --git a/basice2e/clients.goldoutput/client74.out b/basice2e/clients.goldoutput/client74.out index 65a54b00eff1578a48e4da180a633367fdc77e98..73e09903ee6cd2ca3971e37c4216f3aadb6e6c0b 100644 --- a/basice2e/clients.goldoutput/client74.out +++ b/basice2e/clients.goldoutput/client74.out @@ -1,5 +1,4 @@ Sending Message to 4, Jim: Hello, 4 -Message from channel 31, #General: Message from 8, Jake Received: Channel, Hello Message from 6, Steph Received: Hello, 7 Sending Message to 4, Jim: Hello, 4 Message from 6, Steph Received: Hello, 7 diff --git a/basice2e/clients.goldoutput/client8.out b/basice2e/clients.goldoutput/client8.out deleted file mode 100644 index 7d7c42575ec19f9d09eaa22da1ef669aa4076b08..0000000000000000000000000000000000000000 --- a/basice2e/clients.goldoutput/client8.out +++ /dev/null @@ -1 +0,0 @@ -Sending Message to 31, #General: Channel, Hello diff --git a/basice2e/run.sh b/basice2e/run.sh index d6519bf491349bc104db63552705ff42271cab1b..e44b458ecec5b49163b6bef46fe931a52b7482e8 100755 --- a/basice2e/run.sh +++ b/basice2e/run.sh @@ -10,7 +10,6 @@ rm blob* || true SERVERLOGS=results/servers GATEWAYLOGS=results/gateways CLIENTOUT=results/clients -CHANNELOUT=results/channelbot.console DUMMYOUT=results/dummy.console UDBOUT=results/udb.console @@ -87,13 +86,6 @@ runclients() { done } -# Start a channelbot server -CHANNELCMD="../bin/channelbot -v -i 31 -c ..//keys/gateway.cmix.rip.crt -g $GATEWAY -f blobchannel" -$CHANNELCMD >> $CHANNELOUT 2>&1 & -PIDVAL=$! -echo $PIDVAL >> results/serverpids -echo "$CHANNELCMD -- $PIDVAL" - # Start a user discovery bot server UDBCMD="../bin/udb -v --config udb.yaml" $UDBCMD >> $UDBOUT 2>&1 & @@ -102,7 +94,7 @@ echo $PIDVAL >> results/serverpids echo "$UDBCMD -- $PIDVAL" # Start a dummy client -DUMMYCMD="../bin/client -i 35 -d 35 -g $GATEWAY -m \"dummy\" --dummyfrequency 2 -c ../keys/gateway.cmix.rip.crt -f blobdummy" +DUMMYCMD="../bin/client -i 23 -d 23 -g $GATEWAY -m \"dummy\" --dummyfrequency 2 -c ../keys/gateway.cmix.rip.crt -f blobdummy" $DUMMYCMD >> $DUMMYOUT 2>&1 & PIDVAL=$! echo $PIDVAL >> results/serverpids @@ -150,14 +142,7 @@ eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.out 2>&1 & PIDVAL=$! echo "$CLIENTCMD -- $PIDVAL" -# Send a channel message that all clients will receive -CLIENTCMD="timeout 60s ../bin/client -f blob8 -c ../keys/gateway.cmix.rip.crt -g $GATEWAY -i 8 -d 31 -m \"Channel, Hello\"" -eval $CLIENTCMD >> $CLIENTOUT/client8.out 2>&1 & -PIDVAL=$! -echo "$CLIENTCMD -- $PIDVAL" -wait $PIDVAL - -sleep 10 # Spend some time waiting for the channel bot to send messages +sleep 10 echo "RUNNING CLIENTS..." runclients @@ -180,9 +165,6 @@ diff -ruN clients.goldoutput $CLIENTOUT cat $SERVERLOGS/*.log | grep "ERROR" > results/server-errors.txt || true cat $SERVERLOGS/*.log | grep "FATAL" >> results/server-errors.txt || true diff -ruN results/server-errors.txt noerrors.txt -cat $CHANNELOUT | grep "ERROR" > results/channel-errors.txt || true -cat $CHANNELOUT | grep "FATAL" >> results/channel-errors.txt || true -diff -ruN results/channel-errors.txt noerrors.txt cat $DUMMYOUT | grep "ERROR" > results/dummy-errors.txt || true cat $DUMMYOUT | grep "FATAL" >> results/dummy-errors.txt || true diff -ruN results/dummy-errors.txt noerrors.txt diff --git a/basice2e/udb.yaml b/basice2e/udb.yaml index 091e0c13205caea0db3743a8dee8bb9523f46476..650cbcc8c35d030a9eef8d0f1274275057824865 100644 --- a/basice2e/udb.yaml +++ b/basice2e/udb.yaml @@ -1,9 +1,10 @@ # UDB Config for E2E Integration test logPath: "logfile.log" +sessionfile: "./results/udb.session" gateways: - - "localhost:8444" - - "localhost:8443" - - "localhost:8442" - - "localhost:8441" - "localhost:8440" + - "localhost:8441" + - "localhost:8442" + - "localhost:8443" + - "localhost:8444" certPath: "../keys/gateway.cmix.rip.crt" diff --git a/build.sh b/build.sh index f4043b243c660ab7bdf8a922fe87631cbb13c8e1..873ac10cc3ee9b6979b2eb7e1e93a904cf54d04a 100755 --- a/build.sh +++ b/build.sh @@ -7,7 +7,6 @@ mkdir -p bin pushd bin go build gitlab.com/elixxir/client -go build gitlab.com/elixxir/channelbot go build -o udb gitlab.com/elixxir/user-discovery-bot go build gitlab.com/elixxir/gateway go build gitlab.com/elixxir/server