From fef06d4333b71696d25c928c003cc61cd2620a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Mon, 27 Feb 2017 19:37:53 +0100
Subject: [PATCH] Fixed image creation issue with GL CI

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5af2ffb..fb4aee9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -32,27 +32,28 @@ test-2.7:
 
 .image: &image_definition
   stage: images
-  variables:
-    PYTHON_VERSION: "3.5"
-    VERSION: $CI_BUILD_TAG
-    IMAGENAME: $CI_REGISTRY_IMAGE
   before_script:
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
   script:
     - make -e push-$PYTHON_VERSION
   only:
     - tags
+    - master
     - triggers
 
 image-3.5:
   <<: *image_definition
   variables:
     PYTHON_VERSION: "3.5"
+    VERSION: $CI_BUILD_TAG
+    IMAGENAME: $CI_REGISTRY_IMAGE
 
 image-2.7:
   <<: *image_definition
   variables:
     PYTHON_VERSION: "2.7"
+    VERSION: $CI_BUILD_TAG
+    IMAGENAME: $CI_REGISTRY_IMAGE
 
 image-latest:
   stage: release