From 99a28790378d8fa487e8e2d823eaa622ddb88c03 Mon Sep 17 00:00:00 2001
From: "Gervaise H. Henry" <gervaise.henry@utsouthwestern.edu>
Date: Thu, 27 Aug 2020 12:17:32 -0500
Subject: [PATCH] Update .gitlab-ci.yml
---
.gitlab-ci.yml | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 26d4232..0cf5de0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,7 @@ getData:
- push
- tags
except:
- - merge_requests
- script:
+ - merge_requests - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
- ln -sfn `readlink -e ./test_data/auth/cookies.txt` ~/.bdbag/deriva-cookies.txt
- unzip ./test_data/bag/Replicate_Q-Y5F6.zip
- singularity run 'docker://bicf/gudmaprbkfilexfer:2.0.1_indev' bash ./workflow/scripts/bdbagFetch.sh Replicate_Q-Y5F6 Replicate_Q-Y5F6 TEST
@@ -215,7 +214,7 @@ integration_se:
stage: integration
only: [merge_requests]
except:
- - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+ - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /master/
script:
- hostname
- ulimit -a
@@ -238,7 +237,7 @@ integration_pe:
stage: integration
only: [merge_requests]
except:
- - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+ - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /master/
script:
- hostname
- ulimit -a
@@ -262,7 +261,7 @@ override_inputBag:
stage: integration
only: [merge_requests]
except:
- - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+ - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /master/
script:
- hostname
- ulimit -a
@@ -283,7 +282,7 @@ override_fastq:
stage: integration
only: [merge_requests]
except:
- - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+ - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /master/
script:
- hostname
- ulimit -a
@@ -304,7 +303,7 @@ override_species:
stage: integration
only: [merge_requests]
except:
- - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+ - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /master/
script:
- hostname
- ulimit -a
@@ -326,7 +325,7 @@ consistency:
stage: consistency
only: [merge_requests]
except:
- - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"
+ - $CI_MERGE_REQUEST_TARGET_BRANCH_NAME =~ /master/
script:
- grep -m 1 \"Assigned\":.[0-9] SE_multiqc_data.json | grep -oe '\([0-9.]*\)' > assignedSE.txt
- grep -m 1 \"Assigned\":.[0-9] PE_multiqc_data.json | grep -oe '\([0-9.]*\)' > assignedPE.txt
--
GitLab