From cff886d80860127a161c09655211d175f09e81ee Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 30 Aug 2024 15:26:16 +0100 Subject: [PATCH] ci: Don't print structured log data URL People who want to get it will know where to find it. Most people will not care. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci/bare-metal/cros-servo.sh | 3 --- .gitlab-ci/bare-metal/poe-powered.sh | 3 --- .gitlab-ci/lava/lava_job_submitter.py | 10 ---------- 3 files changed, 16 deletions(-) diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh index 48f2583bff6..021ce9022d3 100755 --- a/.gitlab-ci/bare-metal/cros-servo.sh +++ b/.gitlab-ci/bare-metal/cros-servo.sh @@ -116,8 +116,5 @@ set -e # Bring artifacts back from the NFS dir to the build dir where gitlab-runner # will look for them. 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 diff --git a/.gitlab-ci/bare-metal/poe-powered.sh b/.gitlab-ci/bare-metal/poe-powered.sh index bdfd8388a5d..56afc600b17 100755 --- a/.gitlab-ci/bare-metal/poe-powered.sh +++ b/.gitlab-ci/bare-metal/poe-powered.sh @@ -220,9 +220,6 @@ date +'%F %T' # Bring artifacts back from the NFS dir to the build dir where gitlab-runner # will look for them. 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' diff --git a/.gitlab-ci/lava/lava_job_submitter.py b/.gitlab-ci/lava/lava_job_submitter.py index 049c5b9fe2e..0c1b1d6a54b 100755 --- a/.gitlab-ci/lava/lava_job_submitter.py +++ b/.gitlab-ci/lava/lava_job_submitter.py @@ -485,17 +485,7 @@ class LAVAJobSubmitter(PathResolver): finally: 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): - if self.is_under_ci() and self.structured_log_file: - self.print_log_artifact_url() - if not last_attempt_job: # No job was run, something bad happened STRUCTURAL_LOG["job_combined_status"] = "script_crash"