From 0ecca40291763ce9561729affd15e6b8da05e0f8 Mon Sep 17 00:00:00 2001
From: Fabian Schindler <fabian.schindler.strauss@gmail.com>
Date: Thu, 12 Nov 2020 09:56:40 +0100
Subject: [PATCH] Using gitlab CI artifacts for logfiles
---
.gitlab-ci.yml | 9 +++++++++
testing/gitlab_test.sh | 11 ++++-------
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d0841394..71ecd68e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,6 +40,9 @@ build-tag:
- docker push "$IMAGE_6":$CI_COMMIT_TAG
only:
- tags
+ artifacts:
+ paths:
+ - /tmp/*.log
build-master-staging:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build
@@ -80,6 +83,9 @@ build-master-staging:
- master
except:
- tags
+ artifacts:
+ paths:
+ - /tmp/*.log
build:
image: registry.gitlab.eox.at/esa/prism/vs/docker-base-testing:latest
stage: build
@@ -112,3 +118,6 @@ build:
- tags
- staging
- master
+ artifacts:
+ paths:
+ - /tmp/*.log
diff --git a/testing/gitlab_test.sh b/testing/gitlab_test.sh
index 08920c0a..0e6e2765 100755
--- a/testing/gitlab_test.sh
+++ b/testing/gitlab_test.sh
@@ -9,7 +9,6 @@ cat $emg_db > ../env/emg_db.env
cat $emg_django > ../env/emg_django.env
cat $emg_obs > ../env/emg_obs.env
-
# use `pvs_testing` bucket instead
sed -i -e 's/emg-data/pvs_testing/g' ../env/emg.env
@@ -23,7 +22,6 @@ set -o allexport
source ../env/emg.env
set +o allexport
-
mkdir data
docker swarm init
docker network create -d overlay emg-extnet
@@ -33,7 +31,7 @@ printf $OS_PASSWORD_DOWNLOAD | docker secret create OS_PASSWORD_DOWNLOAD -
printf $DJANGO_PASSWORD | docker secret create DJANGO_PASSWORD -
printf $OS_PASSWORD | docker secret create OS_PASSWORD -
-# create docker configs
+# create docker configs
printf $sftp_users_emg | docker config create sftp_users_emg -
docker stack deploy -c ../docker-compose.emg.yml -c ../docker-compose.emg.dev.yml emg-pvs
@@ -48,10 +46,9 @@ if [ $? -ne 0 ]
then
echo "Failure in tests, logging from services:"
for service in $(docker service ls --format "{{.Name}}"); do
- echo "________________________________________"
- docker service ps $service --no-trunc
- docker service logs $service
- done
+ docker service ps $service --no-trunc >> "/tmp/$service.log"
+ docker service logs $service >> "/tmp/$service.log"
+ done
exit 1
fi
--
GitLab