Develop

.gitlab-ci.yml

@@ -213,10 +213,9 @@ outputBag:
 
 integration_se:
   stage: integration
-  only:
-    - merge_requests
+  only: [merge_requests]
   except:
-    - master
+    - $CI_COMMIT_REF_NAME =~ /master/
   script:
   - hostname
   - ulimit -a
@@ -237,10 +236,9 @@ integration_se:
 
 integration_pe:
   stage: integration
-  only:
-    - merge_requests
+  only: [merge_requests]
   except:
-    - master
+    - $CI_COMMIT_REF_NAME =~ /master/
   script:
   - hostname
   - ulimit -a
@@ -262,10 +260,9 @@ integration_pe:
 
 override_inputBag:
   stage: integration
-  only:
-    - merge_requests
+  only: [merge_requests]
   except:
-    - master
+    - $CI_COMMIT_REF_NAME =~ /master/
   script:
   - hostname
   - ulimit -a
@@ -284,10 +281,9 @@ override_inputBag:
 
 override_fastq:
   stage: integration
-  only:
-    - merge_requests
+  only: [merge_requests]
   except:
-    - master
+    - $CI_COMMIT_REF_NAME =~ /master/
   script:
   - hostname
   - ulimit -a
@@ -306,10 +302,8 @@ override_fastq:
     
 override_species:
   stage: integration
-  only:
-    - merge_requests
-  except:
-    - master
+  only: [merge_requests]
+  except: [/master/]
   script:
   - hostname
   - ulimit -a
@@ -329,10 +323,9 @@ override_species:
 
 consistency:
   stage: consistency
-  only:
-    - merge_requests
+  only: [merge_requests]
   except:
-    - master
+    - $CI_COMMIT_REF_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