From 56c1ca733936c7ac095a7945cd1f2c104af36998 Mon Sep 17 00:00:00 2001 From: Marius Gilberg Date: Sat, 8 Nov 2025 17:27:40 +0100 Subject: [PATCH 1/3] Pass the COMMIT_SHA and BUILD_NUMBER env to the CI container so we can use the build cache for sbom generation. --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 11298e0a..9c31e074 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -860,6 +860,8 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ + -e COMMIT_SHA=\"${COMMIT_SHA}\" \ + -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' } From dbd9be25cfcb093dc07f2362a8179542c486358d Mon Sep 17 00:00:00 2001 From: Marius Gilberg Date: Sun, 9 Nov 2025 12:04:04 +0100 Subject: [PATCH 2/3] Revert Jenkinsfile changes 5a7945cd1f2c104af36998. --- Jenkinsfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9c31e074..11298e0a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -860,8 +860,6 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ - -e COMMIT_SHA=\"${COMMIT_SHA}\" \ - -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' } From e79e376ae51d6ecc236bc345dfc6307256ca7756 Mon Sep 17 00:00:00 2001 From: Marius Gilberg Date: Sun, 9 Nov 2025 12:07:53 +0100 Subject: [PATCH 3/3] Pass the COMMIT_SHA and BUILD_NUMBER env to the CI container so we can use the build cache for sbom generation. --- ansible/roles/repository/templates/Jenkinsfile.j2 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ansible/roles/repository/templates/Jenkinsfile.j2 b/ansible/roles/repository/templates/Jenkinsfile.j2 index db34c9d7..4bee0f30 100644 --- a/ansible/roles/repository/templates/Jenkinsfile.j2 +++ b/ansible/roles/repository/templates/Jenkinsfile.j2 @@ -1229,6 +1229,8 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ + -e COMMIT_SHA=\"${COMMIT_SHA}\" \ + -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' }