Merge pull request #200 from aws-lumberyard-dev/test_metrics_endpoint_fix

Test metrics uses both Jenkins endpoints fix

scripts/build/Jenkins/Jenkinsfile

@@ -360,7 +360,10 @@ def TestMetrics(Map options, String workspace, String branchName, String repoNam
                 userRemoteConfigs: [[url: "${env.MARS_REPO}", name: 'mars', credentialsId: "${env.GITHUB_USER}"]]
             ]
             withCredentials([usernamePassword(credentialsId: "${env.SERVICE_USER}", passwordVariable: 'apitoken', usernameVariable: 'username')]) {
-                def command = "${options.PYTHON_DIR}/python.cmd -u mars/scripts/python/ctest_test_metric_scraper.py -e jenkins.creds.user ${username} -e jenkins.creds.pass ${apitoken} ${cmakeBuildDir} ${branchName} %BUILD_NUMBER% AR ${configuration} ${repoName} "
+                def command = "${options.PYTHON_DIR}/python.cmd -u mars/scripts/python/ctest_test_metric_scraper.py " +
+                              "-e jenkins.creds.user ${username} -e jenkins.creds.pass ${apitoken} " +
+                              "-e jenkins.base_url ${env.JENKINS_URL} " +
+                              "${cmakeBuildDir} ${branchName} %BUILD_NUMBER% AR ${configuration} ${repoName} "
                 bat label: "Publishing ${buildJobName} Test Metrics",
                     script: command
             }