Skip to content
Snippets Groups Projects

fix: report correct geoviewer link

Merged Wouter Deconinck requested to merge wdconinc-main-patch-62520 into main
+ 11
12
@@ -14,6 +14,8 @@ default:
@@ -14,6 +14,8 @@ default:
- .local/share
- .local/share
- .local/root_build
- .local/root_build
- geo/
- geo/
 
reports:
 
dotenv: .env
stages:
stages:
- status-pending
- status-pending
@@ -36,7 +38,7 @@ stages:
@@ -36,7 +38,7 @@ stages:
-H "Authorization: token ${GITHUB_REPO_STATUS_TOKEN}" \
-H "Authorization: token ${GITHUB_REPO_STATUS_TOKEN}" \
"https://api.github.com/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}" \
"https://api.github.com/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}" \
-d '{"state":"'"${STATE}"'",
-d '{"state":"'"${STATE}"'",
"target_url":"'"${CI_PIPELINE_URL}"'",
"target_url":"'"${TARGET_URL}"'",
"description":"'"${DESCRIPTION}"'",
"description":"'"${DESCRIPTION}"'",
"context":"eicweb/geoviewer"
"context":"eicweb/geoviewer"
}' ;
}' ;
@@ -47,7 +49,8 @@ geoviewer:pending:
@@ -47,7 +49,8 @@ geoviewer:pending:
extends: .status
extends: .status
variables:
variables:
STATE: "pending"
STATE: "pending"
DESCRIPTION: "The geoviewer exports are running..."
TARGET_URL: "${CI_PIPELINE_URL}"
 
DESCRIPTION: "Started... $(TZ=America/New_York date)"
when: always
when: always
common:setup:
common:setup:
@@ -91,14 +94,8 @@ convert:
@@ -91,14 +94,8 @@ convert:
script:
script:
- mkdir -p geo
- mkdir -p geo
- |
- |
geo_base="geo/${DETECTOR}"
dd_web_display --output geo/${DETECTOR_CONFIG}.root ${DETECTOR_PATH}/${DETECTOR_CONFIG}.xml
dd_web_display --output ${geo_base}.root ${DETECTOR_PATH}/${DETECTOR}.xml
echo "TARGET_URL=https://eic.phy.anl.gov/geoviewer/index.htm?file=https://eicweb.phy.anl.gov/EIC/benchmarks/geoviewer/-/jobs/${CI_JOB_ID}/artifacts/raw/geo/${DETECTOR_CONFIG}.root?job=convert&item=default;1&opt=clipx;clipy;transp30;zoom75;ROTY320;ROTZ340;trz0;trr0;ctrl;all" | tee -a .env
for yml in ${DETECTOR_PATH}/configurations/*.yml; do
name=`basename $yml .yml`
xml_file=${DETECTOR}_${name}.xml
geo_file=${geo_base}_${name}.root
dd_web_display --output ${geo_file} ${DETECTOR_PATH}/${xml_file}
done
report:
report:
stage: finish
stage: finish
@@ -112,7 +109,8 @@ geoviewer:success:
@@ -112,7 +109,8 @@ geoviewer:success:
extends: .status
extends: .status
variables:
variables:
STATE: "success"
STATE: "success"
DESCRIPTION: "The geoviewer exports succeeded!"
TARGET_URL: "${TARGET_URL}"
 
DESCRIPTION: "Succeeded! Click details to view."
when: on_success
when: on_success
geoviewer:failure:
geoviewer:failure:
@@ -120,5 +118,6 @@ geoviewer:failure:
@@ -120,5 +118,6 @@ geoviewer:failure:
extends: .status
extends: .status
variables:
variables:
STATE: "failure"
STATE: "failure"
DESCRIPTION: "The geoviewer exports failed!"
TARGET_URL: "${CI_PIPELINE_URL}"
 
DESCRIPTION: "Failed! $(TZ=America/New_York date)"
when: on_failure
when: on_failure
Loading