From 658a7ec6126e8ed2c4d04eccbb5022d00bc28089 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matev=C5=BE=20Er=C5=BEen?= <matevz.erzen@xlab.si>
Date: Tue, 19 Oct 2021 11:53:52 +0000
Subject: [PATCH] Merge CI tests to Master
---
.dockerignore | 3 ++-
.gitlab-ci.yml | 9 +++++++--
LICENSE.txt | 4 ++++
scheduler/scheduler.py | 2 +-
test/test.sh | 45 ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 59 insertions(+), 4 deletions(-)
create mode 100644 LICENSE.txt
create mode 100755 test/test.sh
diff --git a/.dockerignore b/.dockerignore
index 94b5ab1..5e6c350 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -6,4 +6,5 @@ dump.rdb
.git
.cache
.gitignore
-.gitlab-ci.yml
\ No newline at end of file
+.gitlab-ci.yml
+test/
\ No newline at end of file
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c88a90b..1708e84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ stages:
build:
stage: build
script:
- - docker build --no-cache -t $REGISTRY/medina/$SERVICE:$VERSION .
+ - docker build --no-cache -t $REGISTRY/medina/$SERVICE:$VERSION .
only:
- develop
- master
@@ -23,7 +23,12 @@ build:
test:
stage: test
script:
- - echo "not yet implemented"
+ - apk add bash
+ - docker stop $SERVICE || true && docker rm $SERVICE || true
+ - docker run --name $SERVICE -d $REGISTRY/medina/$SERVICE:$VERSION
+ - sleep 5
+ - bash test/test.sh
+ - docker stop $SERVICE && docker container rm $SERVICE
only:
- develop
- master
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..455e2a7
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,4 @@
+Copyright (C) 2021 XLAB d.o.o.
+Use of this software allowed only to MEDINA partners for the purpose of research in the scope of MEDINA project, as specified in the MEDINA Consortium Agreement.
+No commercial use allowed.
+This program is distributed without any warranty.
\ No newline at end of file
diff --git a/scheduler/scheduler.py b/scheduler/scheduler.py
index 8662516..696dbb8 100644
--- a/scheduler/scheduler.py
+++ b/scheduler/scheduler.py
@@ -31,7 +31,7 @@ scheduler.cron(
'* * * * * ',
func=wazuh_evidence_collector.run_full_check,
args=[],
- repeat=10,
+ repeat=None,
queue_name=constants['redis']['queue'],
use_local_timezone=False
)
diff --git a/test/test.sh b/test/test.sh
new file mode 100755
index 0000000..7eb399f
--- /dev/null
+++ b/test/test.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+logs=$(docker logs $SERVICE 2>&1)
+redis1="# oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo"
+redis2="Ready to accept connections"
+scheduler="Registering birth"
+worker1="Worker rq:worker:"
+worker2="Subscribing to channel rq:pubsub:"
+worker3="Listening on "
+
+if ! [[ $logs =~ $redis1 ]]
+ then
+ echo "Redis server not started" 1>&2
+ exit 1
+fi
+
+if ! [[ $logs =~ $redis2 ]]
+ then
+ echo "Redis server not started" 1>&2
+ exit 1
+fi
+
+if ! [[ $logs =~ $scheduler ]]
+ then
+ echo "Redis queue scheduler not started" 1>&2
+ exit 1
+fi
+
+if ! [[ $logs =~ $worker1 ]]
+ then
+ echo "Redis worker not started" 1>&2
+ exit 1
+fi
+
+if ! [[ $logs =~ $worker2 ]]
+ then
+ echo "Redis worker not started" 1>&2
+ exit 1
+fi
+
+if ! [[ $logs =~ $worker3 ]]
+ then
+ echo "Redis worker not started" 1>&2
+ exit 1
+fi
--
GitLab