Merge branch 'hotfix/smokeup' into 'release'

resurrect smokeinfra

See merge request !64

.gitlab-ci.yml

@@ -76,6 +76,7 @@ installbinaries:
     - bin/gateway --version
   artifacts:
     when: always
+    expire_in: '1 day'
     paths:
      - bin/
 
@@ -90,6 +91,7 @@ basice2e:
     - cd ..
   artifacts:
     when: always
+    expire_in: '1 day'
     paths:
      - basice2e/results/
      - bin/
@@ -112,42 +114,45 @@ basice2e:
 #     - cd ..
 #   artifacts:
 #     when: always
+#     expire_in: '1 day'
 #     paths:
 #      - basice2e/
 #      - bin/
 
-# smokeinfra:
-#   stage: tests
-#   image: $DOCKER_IMAGE
-#   script:
-#     - mkdir -p ~/.elixxir
-#     - echo $PWD
-#     - cd smokeinfra
-#     - ./run.sh
-#     - cd ..
-#   artifacts:
-#     when: always
-#     paths:
-#      - smokeinfra/results/
-#      - bin/
+smokeinfra:
+  stage: tests
+  image: $DOCKER_IMAGE
+  script:
+    - mkdir -p ~/.elixxir
+    - echo $PWD
+    - cd smokeinfra
+    - ./run.sh
+    - cd ..
+  artifacts:
+    when: always
+    expire_in: '1 day'
+    paths:
+     - smokeinfra/results/
+     - bin/
 
 
-# smokeinfraBatch4:
-#   stage: tests
-#   image: $DOCKER_IMAGE
-#   script:
-#     - mkdir -p ~/.elixxir
-#     - echo $PWD
-#     - cd smokeinfra
-#     - git checkout -- .
-#     - sed -i 's/\ 42/\ 4/g' *.yaml
-#     - ./run.sh
-#     - cd ..
-#   artifacts:
-#     when: always
-#     paths:
-#      - smokeinfra/results/
-#      - bin/
+smokeinfraBatch4:
+  stage: tests
+  image: $DOCKER_IMAGE
+  script:
+    - mkdir -p ~/.elixxir
+    - echo $PWD
+    - cd smokeinfra
+    - git checkout -- .
+    - sed -i 's/\ 42/\ 4/g' *.yaml
+    - ./run.sh
+    - cd ..
+  artifacts:
+    when: always
+    expire_in: '1 day'
+    paths:
+     - smokeinfra/results/
+     - bin/
 
 # smokeinfraBatch1:
 #   stage: tests
@@ -162,6 +167,7 @@ basice2e:
 #     - cd ..
 #   artifacts:
 #     when: always
+#     expire_in: '1 day'
 #     paths:
 #      - smokeinfra/results/
 #      - bin/
@@ -176,6 +182,7 @@ benchmark:
     - ./bin/server benchmark -b 1024 -n 5 -i 1
   artifacts:
     when: always
+    expire_in: '1 day'
     paths:
       - bin/
   only:

smokeinfra/gateway-1.yaml

@@ -11,6 +11,9 @@ log: "results/gateway-1.log"
 # Used for debugging
 verbose: "true"
 
+# I am first node
+firstNode: "true"
+
 # The cMix nodes in the network
 cMixNodes:
  - "localhost:60000"

smokeinfra/gateway-3.yaml

@@ -11,6 +11,9 @@ log: "results/gateway-3.log"
 # Used for debugging
 verbose: "true"
 
+# I am last node
+lastNode: "true"
+
 # The cMix nodes in the network
 cMixNodes:
  - "localhost:60000"

smokeinfra/run.sh

@@ -28,6 +28,8 @@ done
 
 echo "STARTING GATEWAYS..."
 
+sleep 5
+
 # Start gateways
 for GWID in $(seq 3 -1 1)
 do
@@ -38,10 +40,12 @@ do
     echo "$GATEWAYCMD -- $PIDVAL"
 done
 
+sleep 120
+
 jobs -p > results/serverpids
 
 finish() {
-    echo "KILLED! STOPPING SERVERS AND GATEWAYS..."
+    echo "STOPPING SERVERS AND GATEWAYS..."
     # NOTE: jobs -p doesn't work in a signal handler
     for job in $(cat results/serverpids)
     do
@@ -55,13 +59,6 @@ trap finish INT
 
 sleep 15
 
-echo "STOPPING SERVERS AND GATEWAYS..."
-# NOTE: jobs -p doesn't work in a signal handler
-for job in $(cat results/serverpids)
-do
-    echo "Stopping $job"
-    kill $job
-done
 
 echo "CHECKING OUTPUT FOR ERRORS"
 set +x
@@ -83,6 +80,5 @@ if [ ! -s rid.txt ]; then
     exit 42
 fi
 
-echo "SUCCESS!"
-
 tail $SERVERLOGS/*.console
+echo "SUCCESS!"