Merge branch 'further_ci_improvements' into 'develop'

Further ci improvements

See merge request !63

.gitlab-ci.yaml

@@ -50,6 +50,8 @@ hivemind_build:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: always
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"'
+      when: always
     - when: always
 
   tags:
@@ -81,6 +83,8 @@ hivemind_sync:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: always
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"'
+      when: always
     - if: '$CI_PIPELINE_SOURCE == "push"'
       when: manual
     - when: on_success
@@ -116,6 +120,8 @@ hivemind_start_server:
   rules:
     - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
       when: always
+    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH == "develop"'
+      when: always
     - if: '$CI_PIPELINE_SOURCE == "push"'
       when: manual
     - when: on_success
@@ -131,7 +137,10 @@ hivemind_stop_server:
 
   variables:
     GIT_STRATEGY: none
-  when: manual
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      when: always
+    - when: manual
   script:
     - scripts/ci_stop_server.sh hive_server.pid
 

scripts/ci_start_api_smoketest.sh

@@ -4,9 +4,9 @@ set -e
 
 cd tests/tests_api/hivemind/tavern
 
-pip3 install --user jsondiff
-pip3 install --user tavern
-pip3 install --user pytest
+pip3 install --user jsondiff==1.2.0
+pip3 install --user tavern==1.2.2
+pip3 install --user pytest==6.0.1
 
 export HIVEMIND_ADDRESS=$1
 export HIVEMIND_PORT=$2

scripts/ci_sync.sh

@@ -29,6 +29,10 @@ kill -SIGINT `pgrep -f "$HIVE_NAME sync"` || true;
 sleep 5
 kill -9 `pgrep -f "$HIVE_NAME sync"` || true;
 
+kill -SIGINT `pgrep -f "$HIVE_NAME server"` || true;
+sleep 5
+kill -9 `pgrep -f "$HIVE_NAME server"` || true;
+
 ls -l dist/*
 rm -rf ./local-site
 mkdir -p `python3 -m site --user-site`