From 9729fd494e524cea5f1ec979c7ae8d40dae4e596 Mon Sep 17 00:00:00 2001
From: Johan Lorenzo <jlorenzo@mozilla.com>
Date: Mon, 30 Sep 2019 20:03:52 +0200
Subject: [PATCH] Bug 1580778 - Fix version names (#5635)

* Bug 1580778 - Put back versionName to releases

* Bug 1580778 - Put quote escaping
---
 taskcluster/ci/build/kind.yml                   | 3 +++
 taskcluster/fenix_taskgraph/transforms/build.py | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/taskcluster/ci/build/kind.yml b/taskcluster/ci/build/kind.yml
index b41deb5ea..e652212be 100644
--- a/taskcluster/ci/build/kind.yml
+++ b/taskcluster/ci/build/kind.yml
@@ -77,6 +77,7 @@ jobs:
     fennec-production:
         attributes:
             nightly: true
+        include-nightly-version: true
         include-shippable-secrets: true
         run:
             geckoview-engine: geckoBeta
@@ -88,6 +89,7 @@ jobs:
         attributes:
             build-type: production
             release-type: beta
+        include-release-version: true
         include-shippable-secrets: true
         run:
             geckoview-engine: geckoBeta
@@ -99,6 +101,7 @@ jobs:
     production:
         attributes:
             release-type: production
+        include-release-version: true
         include-shippable-secrets: true
         run:
             geckoview-engine: geckoBeta
diff --git a/taskcluster/fenix_taskgraph/transforms/build.py b/taskcluster/fenix_taskgraph/transforms/build.py
index 4c6a9e7e0..a9427510e 100644
--- a/taskcluster/fenix_taskgraph/transforms/build.py
+++ b/taskcluster/fenix_taskgraph/transforms/build.py
@@ -9,6 +9,7 @@ kind.
 from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
+import os
 
 from taskgraph.transforms.base import TransformSequence
 from fenix_taskgraph.gradle import get_variant
@@ -83,7 +84,7 @@ def add_nightly_version(config, tasks):
 
     for task in tasks:
         if task.pop("include-nightly-version", False):
-            task["run"]["gradlew"].append('-PversionName="{}"'.format(formated_date_time))
+            task["run"]["gradlew"].append('-PversionName={}'.format(formated_date_time))
         yield task
 
 
@@ -92,10 +93,10 @@ def add_release_version(config, tasks):
     for task in tasks:
         if task.pop("include-release-version", False):
             # TODO Move GIT_TAG to a parameter
-            git_tag = os.environ['GIT_TAG']
+            git_tag = os.environ.get('GIT_TAG', 'vUNSET')
             version = git_tag[1:]  # remove prefixed "v"
 
-            task["run"]["gradlew"].append('-PversionName="{}"'.format(version))
+            task["run"]["gradlew"].append('-PversionName={}'.format(version))
         yield task