Replace JENKINS_URL with JENKINS_PUBLIC_URL
To ensure tf-a-ci-scripts can run on both OpenCI
and Arm Test CI, JENKINS_URL has been replaced with
JENKINS_PUBLIC_URL, as JENKINS_URL is a reserved
private URL in Arm infrastructure.
JENKINS_PUBLIC_URL is a system-wide environment
variable and was configured in:
Manage Jenkins > System > Global Properties
Default values:
OpenCI Production Jenkins: https://ci.trustedfirmware.org/
OpenCI Staging Jenkins: https://ci.staging.trustedfirmware
.org/
arm test CI: https://jenkins.openci-test.arm.com/
Change-Id: I2dee2619bb99c88ef40d37534ea8867880cb8d41
Signed-off-by: Saheer Babu <saheer.babu@arm.com>
diff --git a/script/gen_merge_report.sh b/script/gen_merge_report.sh
index fed9256..434e341 100644
--- a/script/gen_merge_report.sh
+++ b/script/gen_merge_report.sh
@@ -9,7 +9,7 @@
REPORT_HTML=$2
TEST_DEF_FOLDER="${WORKSPACE}/test-definitions"
-if echo "$JENKINS_URL" | grep -q "oss.arm.com"; then
+if echo "$JENKINS_PUBLIC_URL" | grep -q "oss.arm.com"; then
ARTIFACT_PATH='artifact/html'
INFO_PATH='lcov_report/coverage.info'
JSON_PATH='output_file.json'
@@ -37,7 +37,7 @@
import json
import os
-server = os.getenv("JENKINS_URL", "https://jenkins.oss.arm.com/")
+server = os.getenv("JENKINS_PUBLIC_URL", "https://jenkins.oss.arm.com/")
merge_json = {} # json object
_files = []
with open("$REPORT_JSON") as json_file:
@@ -155,7 +155,7 @@
git checkout $TEST_DEFINITIONS_REFSPEC
popd
- if echo "$JENKINS_URL" | grep -q "oss.arm.com"; then
+ if echo "$JENKINS_PUBLIC_URL" | grep -q "oss.arm.com"; then
bash $TEST_DEF_FOLDER/scripts/tools/code_coverage/fastmodel_baremetal/bmcov/report/branch_coverage/merge.sh \
-j $MERGE_JSON -l ${OUTDIR} -p $project
else