Skip to content
Snippets Groups Projects
Commit 4160ba30 authored by Bernardo Cardoso's avatar Bernardo Cardoso
Browse files

Merge branch 'remove-chan' into 'master'

Remove channels from integration

See merge request !29
parents 7f44bb81 ce25a1ae
No related branches found
No related tags found
No related merge requests found
...@@ -23,7 +23,6 @@ variables: ...@@ -23,7 +23,6 @@ variables:
DL_URL_FRAG: jobs/artifacts/master/raw/release DL_URL_FRAG: jobs/artifacts/master/raw/release
SERVER_URL: ${REPOS_API}server/$DL_URL_FRAG/server.linux64?job=build SERVER_URL: ${REPOS_API}server/$DL_URL_FRAG/server.linux64?job=build
CLIENT_URL: ${REPOS_API}client/$DL_URL_FRAG/client.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 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 GATEWAY_URL: ${REPOS_API}gateway/$DL_URL_FRAG/gateway.linux64?job=build
...@@ -47,13 +46,12 @@ installbinaries: ...@@ -47,13 +46,12 @@ installbinaries:
stage: installbinaries stage: installbinaries
image: $DOCKER_IMAGE image: $DOCKER_IMAGE
script: script:
- mkdir -p ~/.elixxir
- mkdir -p bin - mkdir -p bin
- "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/server $SERVER_URL" - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/server $SERVER_URL"
- chmod +x bin/server - chmod +x bin/server
- "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/client $CLIENT_URL" - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/client $CLIENT_URL"
- chmod +x bin/client - 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" - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/udb $UDB_URL"
- chmod +x bin/udb - chmod +x bin/udb
- "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/gateway $GATEWAY_URL" - "curl -f -L -H \"PRIVATE-TOKEN: $PATKEY\" -o bin/gateway $GATEWAY_URL"
...@@ -61,7 +59,6 @@ installbinaries: ...@@ -61,7 +59,6 @@ installbinaries:
- echo $PWD - echo $PWD
- bin/server --version - bin/server --version
- bin/client --version - bin/client --version
- bin/channelbot --version
- bin/udb --version - bin/udb --version
- bin/gateway --version - bin/gateway --version
artifacts: artifacts:
...@@ -73,6 +70,7 @@ basice2e: ...@@ -73,6 +70,7 @@ basice2e:
stage: basice2e stage: basice2e
image: $DOCKER_IMAGE image: $DOCKER_IMAGE
script: script:
- mkdir -p ~/.elixxir
- echo $PWD - echo $PWD
- cd basice2e - cd basice2e
- ./run.sh - ./run.sh
......
Sending Message to 5, Ben: Hello, 5 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 Message from 7, Rick Received: Hello, 4
Sending Message to 5, Ben: Hello, 5 Sending Message to 5, Ben: Hello, 5
Message from 7, Rick Received: Hello, 4 Message from 7, Rick Received: Hello, 4
Sending Message to 6, Steph: Hello, 6 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 Message from 4, Jim Received: Hello, 5
Sending Message to 6, Steph: Hello, 6 Sending Message to 6, Steph: Hello, 6
Message from 4, Jim Received: Hello, 5 Message from 4, Jim Received: Hello, 5
Sending Message to 7, Rick: Hello, 7 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 Message from 5, Ben Received: Hello, 6
Sending Message to 7, Rick: Hello, 7 Sending Message to 7, Rick: Hello, 7
Message from 5, Ben Received: Hello, 6 Message from 5, Ben Received: Hello, 6
Sending Message to 4, Jim: Hello, 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 Message from 6, Steph Received: Hello, 7
Sending Message to 4, Jim: Hello, 4 Sending Message to 4, Jim: Hello, 4
Message from 6, Steph Received: Hello, 7 Message from 6, Steph Received: Hello, 7
Sending Message to 31, #General: Channel, Hello
...@@ -10,7 +10,6 @@ rm blob* || true ...@@ -10,7 +10,6 @@ rm blob* || true
SERVERLOGS=results/servers SERVERLOGS=results/servers
GATEWAYLOGS=results/gateways GATEWAYLOGS=results/gateways
CLIENTOUT=results/clients CLIENTOUT=results/clients
CHANNELOUT=results/channelbot.console
DUMMYOUT=results/dummy.console DUMMYOUT=results/dummy.console
UDBOUT=results/udb.console UDBOUT=results/udb.console
...@@ -87,13 +86,6 @@ runclients() { ...@@ -87,13 +86,6 @@ runclients() {
done 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 # Start a user discovery bot server
UDBCMD="../bin/udb -v --config udb.yaml" UDBCMD="../bin/udb -v --config udb.yaml"
$UDBCMD >> $UDBOUT 2>&1 & $UDBCMD >> $UDBOUT 2>&1 &
...@@ -102,7 +94,7 @@ echo $PIDVAL >> results/serverpids ...@@ -102,7 +94,7 @@ echo $PIDVAL >> results/serverpids
echo "$UDBCMD -- $PIDVAL" echo "$UDBCMD -- $PIDVAL"
# Start a dummy client # 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 & $DUMMYCMD >> $DUMMYOUT 2>&1 &
PIDVAL=$! PIDVAL=$!
echo $PIDVAL >> results/serverpids echo $PIDVAL >> results/serverpids
...@@ -150,14 +142,7 @@ eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.out 2>&1 & ...@@ -150,14 +142,7 @@ eval $CLIENTCMD >> $CLIENTOUT/client9_rekey.out 2>&1 &
PIDVAL=$! PIDVAL=$!
echo "$CLIENTCMD -- $PIDVAL" echo "$CLIENTCMD -- $PIDVAL"
# Send a channel message that all clients will receive sleep 10
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
echo "RUNNING CLIENTS..." echo "RUNNING CLIENTS..."
runclients runclients
...@@ -180,9 +165,6 @@ diff -ruN clients.goldoutput $CLIENTOUT ...@@ -180,9 +165,6 @@ diff -ruN clients.goldoutput $CLIENTOUT
cat $SERVERLOGS/*.log | grep "ERROR" > results/server-errors.txt || true cat $SERVERLOGS/*.log | grep "ERROR" > results/server-errors.txt || true
cat $SERVERLOGS/*.log | grep "FATAL" >> results/server-errors.txt || true cat $SERVERLOGS/*.log | grep "FATAL" >> results/server-errors.txt || true
diff -ruN results/server-errors.txt noerrors.txt 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 "ERROR" > results/dummy-errors.txt || true
cat $DUMMYOUT | grep "FATAL" >> results/dummy-errors.txt || true cat $DUMMYOUT | grep "FATAL" >> results/dummy-errors.txt || true
diff -ruN results/dummy-errors.txt noerrors.txt diff -ruN results/dummy-errors.txt noerrors.txt
......
# UDB Config for E2E Integration test # UDB Config for E2E Integration test
logPath: "logfile.log" logPath: "logfile.log"
sessionfile: "./results/udb.session"
gateways: gateways:
- "localhost:8444"
- "localhost:8443"
- "localhost:8442"
- "localhost:8441"
- "localhost:8440" - "localhost:8440"
- "localhost:8441"
- "localhost:8442"
- "localhost:8443"
- "localhost:8444"
certPath: "../keys/gateway.cmix.rip.crt" certPath: "../keys/gateway.cmix.rip.crt"
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
mkdir -p bin mkdir -p bin
pushd bin pushd bin
go build gitlab.com/elixxir/client go build gitlab.com/elixxir/client
go build gitlab.com/elixxir/channelbot
go build -o udb gitlab.com/elixxir/user-discovery-bot go build -o udb gitlab.com/elixxir/user-discovery-bot
go build gitlab.com/elixxir/gateway go build gitlab.com/elixxir/gateway
go build gitlab.com/elixxir/server go build gitlab.com/elixxir/server
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment