From 937046b0a3cc2ed1d765f1d50e21068031f23b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de> Date: Mon, 17 Dec 2018 10:07:04 +0100 Subject: [PATCH 1/3] closing #9 --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b787bf6..ba49f56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -40,7 +40,7 @@ test-basic: - rm -f build/sade_job-* - mv build/sade /opt/ - bash '/opt/sade/bin/startup.sh' & - - while [ ! -f /opt/sade/sade.beacon ]; do sleep 2s; done && sleep 15s + - while [ $(curl --head --silent http://localhost:8080 | grep -c "200 OK") == 0 ]; do sleep 2s; done - cd /opt/sade/bin; ./shutdown.sh -u admin -p "$pw" - cd $DIR - mv /opt/sade_job* build/ @@ -72,7 +72,7 @@ generic: - wget --no-check-certificate "https://res.de.dariah.eu/scripts/push-to-aptly.sh" - chmod +x push-to-aptly.sh - ./push-to-aptly.sh - + architrave: stage: deploy allow_failure: true -- GitLab From 4a23f54cc63ba77d9565bc7938e954b4e97234bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de> Date: Mon, 17 Dec 2018 10:27:08 +0100 Subject: [PATCH 2/3] remove artifact collection --- .gitlab-ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba49f56..2e2e3b4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,19 +34,12 @@ test-basic: - build script: - DIR="$(pwd)" -# write the job id to a file, so that eXist can read it (SADE: post-install.xql) - - echo -n "$CI_JOB_ID" > /tmp/ci.job # remove an old testlogfile - - rm -f build/sade_job-* - mv build/sade /opt/ - bash '/opt/sade/bin/startup.sh' & - while [ $(curl --head --silent http://localhost:8080 | grep -c "200 OK") == 0 ]; do sleep 2s; done - cd /opt/sade/bin; ./shutdown.sh -u admin -p "$pw" - cd $DIR - - mv /opt/sade_job* build/ - - cat build/sade_job-* - - apt-get -qq update > /dev/null && apt-get -qq install bc > /dev/null - - ./generic-test.sh artifacts: paths: - build/*.xml -- GitLab From 1183f08bff11d347be578e8604742ffbbea4ca99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathias=20G=C3=B6bel?= <goebel@sub.uni-goettingen.de> Date: Mon, 17 Dec 2018 10:38:49 +0100 Subject: [PATCH 3/3] remove deployment on specific branches --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e2e3b4..2ae42d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,6 +56,11 @@ test-basic: - ./build/sade/bin/startup.sh & sleep 60; ./build/sade/bin/shutdown.sh generic: + only: + - develop + - master + except: + - tags stage: deploy script: - ant -f generic.xml build-debian-package @@ -67,6 +72,11 @@ generic: - ./push-to-aptly.sh architrave: + only: + - develop + - master + except: + - tags stage: deploy allow_failure: true script: -- GitLab