From 67d9fb386b489dea9f1c4b0086d5afe4ba84ecaa Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 19:42:59 +0200 Subject: [PATCH 1/2] in-line code for better readability --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bc8af4d11..06f6909b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -79,7 +79,7 @@ variables: checkout: stage: prepareAll before_script: - - $HOME/wait.sh + - while [ -e $HOME/GitLabCI.lock ]; do sleep 5m; done - echo $CI_PIPELINE_ID > $HOME/GitLabCI.lock script: - mkdir -p $DAMASKROOT From 45f192be09fa9521217c88d4d3f78b036c2c58af Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 13 Apr 2017 19:56:52 +0200 Subject: [PATCH 2/2] safe in case of failing prepareAll --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06f6909b6..1403b24c5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -483,7 +483,7 @@ removeLock: before_script: - echo 'Do nothing' when: always - script: rm $HOME/GitLabCI.lock + script: if grep -q $CI_PIPELINE_ID $HOME/GitLabCI.lock; then; rm $HOME/GitLabCI.lock; fi except: - master - release