From e0bfc6e1209618f25800c1401d156cf9bd0bdd92 Mon Sep 17 00:00:00 2001
From: pragnagopa <pgopa@microsoft.com>
Date: Tue, 16 Jun 2020 09:14:13 -0700
Subject: [PATCH] Use env vars in worker.config.json Use Dev CLI for tests

---
 appveyor.yml                        | 2 +-
 azure-pipelines.yml                 | 2 +-
 e2e-nightly-cli-azure-pipelines.yml | 2 +-
 pom.xml                             | 2 +-
 setup-tests-pipeline.ps1            | 4 ++--
 setup-tests.ps1                     | 4 ++--
 worker.config.json                  | 4 ++--
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index b044c2bd..c176ce7e 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -30,7 +30,7 @@ build_script:
        Write-Host “Found git tag."
       } 
       else {
-       $buildNumber = "1.5.3-$env:APPVEYOR_BUILD_NUMBER"
+       $buildNumber = "1.6.2-$env:APPVEYOR_BUILD_NUMBER"
        Write-Host “git tag not found. Setting package suffix to '$buildNumber'"
       }     
       .\package.ps1 -buildNumber $buildNumber
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 44801476..6c51984e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -19,7 +19,7 @@ steps:
        Write-Host “Found git tag."
       } 
       else {
-       $buildNumber = "1.5.3-$(Build.BuildId)"
+       $buildNumber = "1.6.2-$(Build.BuildId)"
        Write-Host “git tag not found. Setting package suffix to '$buildNumber'"
       }     
       .\package.ps1 -buildNumber $buildNumber
diff --git a/e2e-nightly-cli-azure-pipelines.yml b/e2e-nightly-cli-azure-pipelines.yml
index a3daa45c..098f7677 100644
--- a/e2e-nightly-cli-azure-pipelines.yml
+++ b/e2e-nightly-cli-azure-pipelines.yml
@@ -19,7 +19,7 @@ steps:
        Write-Host “Found git tag."
       } 
       else {
-       $buildNumber = "1.5.3-$(Build.BuildId)"
+       $buildNumber = "1.6.2-$(Build.BuildId)"
        Write-Host “git tag not found. Setting package suffix to '$buildNumber'"
       }     
       .\package.ps1 -buildNumber $buildNumber
diff --git a/pom.xml b/pom.xml
index 06aa9096..78e4a3a5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.azure.functions</groupId>
 	<artifactId>azure-functions-java-worker</artifactId>
-	<version>1.5.3</version>
+	<version>1.6.2</version>
 	<packaging>jar</packaging>
 	<parent>
 		<groupId>com.microsoft.maven</groupId>
diff --git a/setup-tests-pipeline.ps1 b/setup-tests-pipeline.ps1
index d03017b8..9758553b 100644
--- a/setup-tests-pipeline.ps1
+++ b/setup-tests-pipeline.ps1
@@ -17,13 +17,13 @@ if(!$skipCliDownload)
 
   Write-Host "Downloading Functions Core Tools...."
   Invoke-RestMethod -Uri 'https://functionsclibuilds.blob.core.windows.net/builds/3/latest/version.txt' -OutFile version.txt
-  Write-Host "Using Functions Core Tools version: $(Get-Content -Raw version.txt)"
+  Write-Host "Using Functions Core Tools version: pgopa-CLI"
   $version = "$(Get-Content -Raw version.txt)"
   Remove-Item version.txt
 
   if ($version -and $version.trim())
   {
-    $env:CORE_TOOLS_URL = "https://functionsclibuilds.blob.core.windows.net/builds/3/latest/Azure.Functions.Cli.win-x86.zip"
+    $env:CORE_TOOLS_URL = "https://pgopafunctestv2storage.blob.core.windows.net/cli/pgopa-cli.zip"
   }
   Write-Host "CORE_TOOLS_URL: $env:CORE_TOOLS_URL"
   $output = "$currDir\Azure.Functions.Cli.zip"
diff --git a/setup-tests.ps1 b/setup-tests.ps1
index eb812254..78e60ca9 100644
--- a/setup-tests.ps1
+++ b/setup-tests.ps1
@@ -25,13 +25,13 @@ if(!$skipCliDownload)
 
   Write-Host "Downloading Functions Core Tools...."
   Invoke-RestMethod -Uri 'https://functionsclibuilds.blob.core.windows.net/builds/3/latest/version.txt' -OutFile version.txt
-  Write-Host "Using Functions Core Tools version: $(Get-Content -Raw version.txt)"
+  Write-Host "Using Functions Core Tools version: pgopa-CLI"
   $version = "$(Get-Content -Raw version.txt)"
   Remove-Item version.txt
 
   if ($version -and $version.trim())
   {
-    $env:CORE_TOOLS_URL = "https://functionsclibuilds.blob.core.windows.net/builds/3/latest/Azure.Functions.Cli.win-x86.zip"
+    $env:CORE_TOOLS_URL = "https://pgopafunctestv2storage.blob.core.windows.net/cli/pgopa-cli.zip"
   }
   Write-Host "CORE_TOOLS_URL: $env:CORE_TOOLS_URL"
   $output = "$currDir\Azure.Functions.Cli.zip"
diff --git a/worker.config.json b/worker.config.json
index 0b20d3ae..c4f32102 100644
--- a/worker.config.json
+++ b/worker.config.json
@@ -2,8 +2,8 @@
     "description": {
         "language": "java",
         "extensions": [".jar"],
-        "defaultExecutablePath": "java",
+        "defaultExecutablePath": "%JAVA_HOME%/bin/java",
         "defaultWorkerPath": "azure-functions-java-worker.jar",
-        "arguments": ["-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -noverify -Djava.net.preferIPv4Stack=true -jar"]
+        "arguments": ["-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -noverify -Djava.net.preferIPv4Stack=true -jar", "%JAVA_OPTS%"]
     }
 }
\ No newline at end of file