From fcecc0d69100d2c9f72343a6e7512bd6f162bd2c Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 7 Mar 2018 12:03:10 -0800
Subject: [PATCH] Move setting up environment variables in to build stage

---
 build/buildpipeline/linux.groovy    |  5 +++++
 build/buildpipeline/osx.groovy      |  5 +++++
 build/buildpipeline/pipeline.groovy | 18 +++++++-----------
 build/buildpipeline/windows.groovy  |  5 +++++
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/build/buildpipeline/linux.groovy b/build/buildpipeline/linux.groovy
index ea5428f9af..bf5cb24b84 100644
--- a/build/buildpipeline/linux.groovy
+++ b/build/buildpipeline/linux.groovy
@@ -5,6 +5,11 @@ simpleNode('Ubuntu16.04', 'latest-or-auto-docker') {
         checkout scm
     }
     stage ('Build') {
+        environment {
+            DOTNET_CLI_TELEMETRY_OPTOUT = 'true'
+            DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 'true'
+        }
+
         sh './build.sh'
     }
 }
diff --git a/build/buildpipeline/osx.groovy b/build/buildpipeline/osx.groovy
index 4ba37e4af1..1edc741f69 100644
--- a/build/buildpipeline/osx.groovy
+++ b/build/buildpipeline/osx.groovy
@@ -5,6 +5,11 @@ simpleNode('OSX10.12','latest') {
         checkout scm
     }
     stage ('Build') {
+        environment {
+            DOTNET_CLI_TELEMETRY_OPTOUT = 'true'
+            DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 'true'
+        }
+
         sh './build.sh'
     }
 }
diff --git a/build/buildpipeline/pipeline.groovy b/build/buildpipeline/pipeline.groovy
index ef41be50a6..e915cadae1 100644
--- a/build/buildpipeline/pipeline.groovy
+++ b/build/buildpipeline/pipeline.groovy
@@ -5,18 +5,14 @@ def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.gro
 def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy')
 String configuration = 'Release'
 def parameters = [
-    'Configuration': configuration,
-    'DOTNET_CLI_TELEMETRY_OPTOUT': 'true',
-    'DOTNET_SKIP_FIRST_TIME_EXPERIENCE': 'true'
+    'Configuration': configuration
 ]
 
-def jobName = "${RepoName} ${BranchName}"
+windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters)
+windowsPipeline.triggerPipelineOnGithubPush(parameters)
 
-windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters, jobName)
-windowsPipeline.triggerPipelineOnGithubPush(parameters, jobName)
+linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters)
+linuxPipeline.triggerPipelineOnGithubPush(parameters)
 
-linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters, jobName)
-linuxPipeline.triggerPipelineOnGithubPush(parameters, jobName)
-
-osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters, jobName)
-osxPipeline.triggerPipelineOnGithubPush(parameters, jobName)
+osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters)
+osxPipeline.triggerPipelineOnGithubPush(parameters)
diff --git a/build/buildpipeline/windows.groovy b/build/buildpipeline/windows.groovy
index c650b781a6..0a48753500 100644
--- a/build/buildpipeline/windows.groovy
+++ b/build/buildpipeline/windows.groovy
@@ -7,6 +7,11 @@ simpleNode('Windows_NT','latest') {
         checkout scm
     }
     stage ('Build') {
+        environment {
+            DOTNET_CLI_TELEMETRY_OPTOUT = 'true'
+            DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 'true'
+        }
+
         bat '.\\run.cmd default-build'
     }
 }