From 0b623f6cb451261b215391f34322ad42bc4c508f Mon Sep 17 00:00:00 2001
From: Bartek Wrona <wrona@syncad.com>
Date: Fri, 17 Jul 2020 19:32:39 +0200
Subject: [PATCH] Hive server start moved into dedicated script.
---
.gitlab-ci.yaml | 17 +++--------------
scripts/ci_start_server.sh | 3 ++-
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/.gitlab-ci.yaml b/.gitlab-ci.yaml
index 98d0d1cea..a04277fba 100644
--- a/.gitlab-ci.yaml
+++ b/.gitlab-ci.yaml
@@ -55,17 +55,10 @@ hivemind_sync:
artifacts: true
variables:
GIT_STRATEGY: none
- HIVEMIND_MAX_BLOCK: 50000
script:
- scripts/ci_sync.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_MAX_BLOCK
- - echo Attempting to start hive server listening on $HIVEMIND_HTTP_PORT port...
- - if [ -f hive_server.pid ]; then kill -SIGINT `cat hive_server.pid`; fi;
- - rm -f hive_server.pid
- - screen -L -Logfile hive_server.log -dmS hive_server_$CI_JOB_ID ./local-site/bin/hive server --pid-file hive_server.pid --http-server-port $HIVEMIND_HTTP_PORT --steemd-url "$HIVEMIND_SOURCE_HIVED_URL" --database-url $DB_URL
- - for i in `seq 1 10`; do if [ -f hive_server.pid ]; then break; else sleep 1; fi; done
- - cat hive_server.pid
-
+ - scripts/ci_start_server.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_HTTP_PORT
artifacts:
paths:
- hivemind-sync.log
@@ -85,12 +78,8 @@ hivemind_start_server:
GIT_STRATEGY: none
script:
- - echo Attempting to start hive server listening on $HIVEMIND_HTTP_PORT port...
- - if [ -f hive_server.pid ]; then kill -SIGINT `cat hive_server.pid`; fi;
- - rm -f hive_server.pid
- - screen -L -Logfile hive_server.log -dmS hive_server_$CI_JOB_ID ./local-site/bin/hive server --pid-file hive_server.pid --http-server-port $HIVEMIND_HTTP_PORT --steemd-url "$HIVEMIND_SOURCE_HIVED_URL" --database-url $DB_URL
- - for i in `seq 1 10`; do if [ -f hive_server.pid ]; then break; else sleep 1; fi; done
- - cat hive_server.pid
+ - scripts/ci_start_server.sh "$HIVEMIND_DB_NAME" "$HIVEMIND_POSTGRESQL_CONNECTION_STRING" "$HIVEMIND_SOURCE_HIVED_URL" $HIVEMIND_HTTP_PORT
+
artifacts:
paths:
- hive_server.log
diff --git a/scripts/ci_start_server.sh b/scripts/ci_start_server.sh
index 1e11c4b46..f0efc1051 100644
--- a/scripts/ci_start_server.sh
+++ b/scripts/ci_start_server.sh
@@ -20,4 +20,5 @@ if [ -f hive_server.pid ]; then kill -SIGINT `cat hive_server.pid`; fi;
rm -f hive_server.pid
screen -L -Logfile hive_server.log -dmS hive_server_$CI_JOB_ID ./local-site/bin/hive server --pid-file hive_server.pid --http-server-port $HIVEMIND_HTTP_PORT --steemd-url "$HIVEMIND_SOURCE_HIVED_URL" --database-url $DB_URL
for i in `seq 1 10`; do if [ -f hive_server.pid ]; then break; else sleep 1; fi; done
-cat hive_server.pid
+if [ -f hive_server.pid ]; then echo "Hive server started successfully..."; else "Hive server start failure..." ; fi;
+
--
GitLab