AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Don't print structured log data URL

Browse Source 
People who want to get it will know where to find it. Most people will
not care.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31602>
This commit is contained in:
Daniel Stone
2024-08-30 15:26:16 +01:00
parent 9af1ceb7a2
commit cff886d808
3 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitlab-ci/bare-metal/cros-servo.sh
View File

@@ -116,8 +116,5 @@ set -e
# Bring artifacts back from the NFS dir to the build dir where gitlab-runner # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
# will look for them. # will look for them.
cp -Rp /nfs/results/. results/ cp -Rp /nfs/results/. results/
if [ -f "${STRUCTURED_LOG_FILE}" ]; then
echo "Structured log file is available at https://${CI_PROJECT_ROOT_NAMESPACE}.pages.freedesktop.org/-/${CI_PROJECT_NAME}/-/jobs/${CI_JOB_ID}/artifacts/results/${STRUCTURED_LOG_FILE}"
fi
exit $ret exit $ret

3
.gitlab-ci/bare-metal/poe-powered.sh
View File

@@ -220,9 +220,6 @@ date +'%F %T'
# Bring artifacts back from the NFS dir to the build dir where gitlab-runner # Bring artifacts back from the NFS dir to the build dir where gitlab-runner
# will look for them. # will look for them.
cp -Rp /nfs/results/. results/ cp -Rp /nfs/results/. results/
if [ -f "${STRUCTURED_LOG_FILE}" ]; then
echo "Structured log file is available at ${ARTIFACTS_BASE_URL}/results/${STRUCTURED_LOG_FILE}"
fi
date +'%F %T' date +'%F %T'

10
.gitlab-ci/lava/lava_job_submitter.py
View File

@@ -485,17 +485,7 @@ class LAVAJobSubmitter(PathResolver):
finally: finally:
self.finish_script(last_attempt_job) self.finish_script(last_attempt_job)
def print_log_artifact_url(self):
relative_log_path = self.structured_log_file.relative_to(pathlib.Path.cwd())
full_path = f"$ARTIFACTS_BASE_URL/{relative_log_path}"
artifact_url = path.expandvars(full_path)
print_log(f"Structural Logging data available at: {artifact_url}")
def finish_script(self, last_attempt_job): def finish_script(self, last_attempt_job):
if self.is_under_ci() and self.structured_log_file:
self.print_log_artifact_url()
if not last_attempt_job: if not last_attempt_job:
# No job was run, something bad happened # No job was run, something bad happened
STRUCTURAL_LOG["job_combined_status"] = "script_crash" STRUCTURAL_LOG["job_combined_status"] = "script_crash"