gitlab CI: combine "variables" sections

2017-12-30 11:28:57 -06:00 · 2017-12-30 11:28:57 -06:00 · 319c4493a4
commit 319c4493a4
parent ff37050545
1 changed files with 2 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -73,12 +73,11 @@ Ubuntu Linux:ASAN:
  stage: build
  variables:
    ASAN: 1
+    FLAVOR: zesty_asan

  before_script:
    - ./ci/ubuntu_prep.sh

-  variables:
-    FLAVOR: zesty_asan


 Ubuntu Linux:TSAN:
@ -86,12 +85,11 @@ Ubuntu Linux:TSAN:
  stage: build
  variables:
    TSAN: 1
+    FLAVOR: zesty_tsan

  before_script:
    - ./ci/ubuntu_prep.sh

-  variables:
-    FLAVOR: zesty_tsan


 # DISABLED: Shared runners avail for gitlab CI