birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LYN-4332 Metric jobs not passing JOB_NAME, BUILD_NUMBER, NODE_NAME, CHANGE_ID (#1190)

Browse Source 
* 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
This commit is contained in:
Esteban Papp
2021-06-08 14:24:22 -07:00
committed by GitHub
parent dd95d2b02e
commit b1fca488bf
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/build/Platform/Linux/build_config.json
+1 -1
View File
@@ -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": {
scripts/build/Platform/Linux/python_linux.sh
+2 -2
View File
@@ -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}
echo [ci_build] python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
scripts/build/Platform/Mac/build_config.json
+1 -1
View File
@@ -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": {
scripts/build/Platform/Mac/python_mac.sh
+2 -2
View File
@@ -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}
echo [ci_build] python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
python/python.sh -u ${SCRIPT_PATH} $(eval echo ${SCRIPT_PARAMETERS})
scripts/build/Platform/Windows/build_config.json
+1 -1
View File
@@ -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": {
scripts/build/Platform/iOS/build_config.json
+1 -1
View File
@@ -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": {