From b1fca488bf94b66d65e9421d2e5600af778b4763 Mon Sep 17 00:00:00 2001
From: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:24:22 -0700
Subject: [PATCH] LYN-4332 Metric jobs not passing JOB_NAME, BUILD_NUMBER,
 NODE_NAME, CHANGE_ID (#1190)

* Fix quotes

* Revert "Fix quotes"

This reverts commit 29ace5ef2bf1c78991a8cfeb840bfb30c4ce5d8d.

* evaluating the parameters

* Revert "Revert "Fix quotes""

This reverts commit 4f7008e9ccbd5fdc0b33853a4fb1f50285233da9.

* just one eval

* double escaping

* another attempt to happiness

* changing NODE_NAME to LABEL_NAME since that one is more stable and doesnt have spaces
---
 scripts/build/Platform/Linux/build_config.json   | 2 +-
 scripts/build/Platform/Linux/python_linux.sh     | 4 ++--
 scripts/build/Platform/Mac/build_config.json     | 2 +-
 scripts/build/Platform/Mac/python_mac.sh         | 4 ++--
 scripts/build/Platform/Windows/build_config.json | 2 +-
 scripts/build/Platform/iOS/build_config.json     | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/build/Platform/Linux/build_config.json b/scripts/build/Platform/Linux/build_config.json
index ee6da77b29..660bc50da6 100644
--- a/scripts/build/Platform/Linux/build_config.json
+++ b/scripts/build/Platform/Linux/build_config.json
@@ -24,7 +24,7 @@
     "COMMAND": "python_linux.sh",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform Linux --jobname '${JOB_NAME}' --jobnumber '${BUILD_NUMBER}' --jobnode '${NODE_NAME}' --changelist '${CHANGE_ID}'"
+      "SCRIPT_PARAMETERS": "--platform Linux --jobname=\\'${JOB_NAME}\\' --jobnumber \\'${BUILD_NUMBER}\\' --jobnode \\'${NODE_LABEL}\\' --changelist \\'${CHANGE_ID}\\'"
     }
   },
   "debug": {
diff --git a/scripts/build/Platform/Linux/python_linux.sh b/scripts/build/Platform/Linux/python_linux.sh
index 6e1bd73b36..0fe205fcc2 100755
--- a/scripts/build/Platform/Linux/python_linux.sh
+++ b/scripts/build/Platform/Linux/python_linux.sh
@@ -12,5 +12,5 @@
 
 set -o errexit # exit on the first failure encountered
 
-echo [ci_build] python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
-python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
\ No newline at end of file
+echo [ci_build] python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
+python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
\ No newline at end of file
diff --git a/scripts/build/Platform/Mac/build_config.json b/scripts/build/Platform/Mac/build_config.json
index 971e5e47a1..c02227c613 100644
--- a/scripts/build/Platform/Mac/build_config.json
+++ b/scripts/build/Platform/Mac/build_config.json
@@ -24,7 +24,7 @@
     "COMMAND": "python_mac.sh",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform Mac --jobname '${JOB_NAME}' --jobnumber '${BUILD_NUMBER}' --jobnode '${NODE_NAME}' --changelist '${CHANGE_ID}'"
+      "SCRIPT_PARAMETERS": "--platform Mac --jobname \\'${JOB_NAME}\\' --jobnumber \\'${BUILD_NUMBER}\\' --jobnode \\'${NODE_LABEL}\\' --changelist \\'${CHANGE_ID}\\'"
     }
   },
   "debug": {
diff --git a/scripts/build/Platform/Mac/python_mac.sh b/scripts/build/Platform/Mac/python_mac.sh
index 6e1bd73b36..0fe205fcc2 100755
--- a/scripts/build/Platform/Mac/python_mac.sh
+++ b/scripts/build/Platform/Mac/python_mac.sh
@@ -12,5 +12,5 @@
 
 set -o errexit # exit on the first failure encountered
 
-echo [ci_build] python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
-python/python.sh -u ${SCRIPT_PATH} ${SCRIPT_PARAMETERS}
\ No newline at end of file
+echo [ci_build] python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
+python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
\ No newline at end of file
diff --git a/scripts/build/Platform/Windows/build_config.json b/scripts/build/Platform/Windows/build_config.json
index 552ef2c6fd..71abf9021f 100644
--- a/scripts/build/Platform/Windows/build_config.json
+++ b/scripts/build/Platform/Windows/build_config.json
@@ -56,7 +56,7 @@
     "COMMAND": "python_windows.cmd",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform Windows --jobname \"!JOB_NAME!\" --jobnumber \"!BUILD_NUMBER!\" --jobnode \"!NODE_NAME!\" --changelist \"!CHANGE_ID!\""
+      "SCRIPT_PARAMETERS": "--platform Windows --jobname \"!JOB_NAME!\" --jobnumber \"!BUILD_NUMBER!\" --jobnode \"!NODE_LABEL!\" --changelist \"!CHANGE_ID!\""
     }
   },
   "windows_packaging_all": {
diff --git a/scripts/build/Platform/iOS/build_config.json b/scripts/build/Platform/iOS/build_config.json
index 2d9c57f6ee..9fd0f8c7fc 100644
--- a/scripts/build/Platform/iOS/build_config.json
+++ b/scripts/build/Platform/iOS/build_config.json
@@ -14,7 +14,7 @@
     "COMMAND": "../Mac/python_mac.sh",
     "PARAMETERS": {
       "SCRIPT_PATH": "scripts/build/ci_build_metrics.py",
-      "SCRIPT_PARAMETERS": "--platform iOS --jobname '${JOB_NAME}' --jobnumber '${BUILD_NUMBER}' --jobnode '${NODE_NAME}' --changelist '${CHANGE_ID}'"
+      "SCRIPT_PARAMETERS": "--platform iOS --jobname '${JOB_NAME}' --jobname \\'${JOB_NAME}\\' --jobnumber \\'${BUILD_NUMBER}\\' --jobnode \\'${NODE_LABEL}\\' --changelist \\'${CHANGE_ID}\\'"
     }
   },
   "debug": {