From 319c4493a400e148840789d973078a40c9f66c28 Mon Sep 17 00:00:00 2001
From: androm3da <bcain@codeaurora.org>
Date: Sat, 30 Dec 2017 11:28:57 -0600
Subject: [PATCH] gitlab CI: combine "variables" sections

---
 .gitlab-ci.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0ddd6218..43d75787 100644
--- 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