From 14b57345fd1ce6eed1da55e7ce550d581d1be920 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Wed, 4 Dec 2024 13:22:19 -0500 Subject: [PATCH 1/6] update params check --- tooling/reproducible/windows_repro_build_compare.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index e8b5b2400..015e84611 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -19,7 +19,7 @@ set -e # Check All 3 Params Are Supplied -if [ "$#" -lt 2 ]; then +if [ "$#" -lt 3 ]; then echo "Usage: $0 SBOM_URL/SBOM_PATH JDKZIP_URL/JDKZIP_PATH" echo "" echo "1. SBOM_URL/SBOM_PATH - should be the FULL path OR a URL to a Temurin JDK SBOM JSON file in CycloneDX Format" @@ -28,6 +28,8 @@ if [ "$#" -lt 2 ]; then echo "2. JDKZIP_URL/JDKZIP_PATH - should be the FULL path OR a URL to a Temurin Windows JDK Zip file" echo " eg. https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_x64_windows_hotspot_21.0.2_13.zip" echo "" + echo "3. REPORT_DIR - should be the FULL path OR a URL to the output directory for the comparison report" + echo "" exit 1 fi From 194de9ff206faf6f8b016bd59e3ae85dd3c118ba Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Wed, 4 Dec 2024 15:59:57 -0500 Subject: [PATCH 2/6] check if default sbom and jdk available Signed-off-by: Sophia Guo --- test/system/reproducibleCompare/reproducible.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/system/reproducibleCompare/reproducible.mk b/test/system/reproducibleCompare/reproducible.mk index e6fbfb2a1..d90519fe1 100644 --- a/test/system/reproducibleCompare/reproducible.mk +++ b/test/system/reproducibleCompare/reproducible.mk @@ -13,6 +13,9 @@ ifndef SBOM_FILE SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata") + ifeq ($(strip $(SBOM_FILE)),) + $(error no SBOM_FILE available) + endif SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) endif ifndef JDK_FILE @@ -20,6 +23,9 @@ ifndef JDK_FILE ifneq (,$(findstring win,$(SPEC))) JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.zip') endif + ifeq ($(strip $(JDK_FILE)),) + $(error no JDK_FILE available) + endif endif ifneq (,$(findstring linux,$(SPEC))) From 76e838e0dd42be9a42d2d41d8d64a03c0133243a Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Wed, 4 Dec 2024 16:27:44 -0500 Subject: [PATCH 3/6] check if default sbom and jdk available --- .../reproducibleCompare/reproducible.mk | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/test/system/reproducibleCompare/reproducible.mk b/test/system/reproducibleCompare/reproducible.mk index d90519fe1..2f858a16a 100644 --- a/test/system/reproducibleCompare/reproducible.mk +++ b/test/system/reproducibleCompare/reproducible.mk @@ -12,24 +12,25 @@ # ******************************************************************************** ifndef SBOM_FILE - SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata") - ifeq ($(strip $(SBOM_FILE)),) - $(error no SBOM_FILE available) - endif - SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) +SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata") +ifeq ($(strip $(SBOM_FILE)),) +$(error ERROR! NO SBOM_FILE AVAILABLE) endif +SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) +endif + ifndef JDK_FILE - JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.tar.gz') - ifneq (,$(findstring win,$(SPEC))) - JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.zip') - endif - ifeq ($(strip $(JDK_FILE)),) - $(error no JDK_FILE available) - endif +JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.tar.gz') +ifneq (,$(findstring win,$(SPEC))) +JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.zip') +endif +ifeq ($(strip $(JDK_FILE)),) +$(error ERROR! NO JDK_FILE AVAILABLE) +endif endif ifneq (,$(findstring linux,$(SPEC))) - SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE)) +SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE)) endif RM_DEBUGINFO := $(shell find $(TEST_JDK_HOME) -type f -name "*.debuginfo" -delete) \ No newline at end of file From ebd638f6dffb5f6fb8eddf6b218d57091106ad56 Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Thu, 5 Dec 2024 09:30:55 -0500 Subject: [PATCH 4/6] Format Signed-off-by: Sophia Guo --- .../reproducibleCompare/reproducible.mk | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/test/system/reproducibleCompare/reproducible.mk b/test/system/reproducibleCompare/reproducible.mk index 2f858a16a..692fc9063 100644 --- a/test/system/reproducibleCompare/reproducible.mk +++ b/test/system/reproducibleCompare/reproducible.mk @@ -12,25 +12,25 @@ # ******************************************************************************** ifndef SBOM_FILE -SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata") -ifeq ($(strip $(SBOM_FILE)),) -$(error ERROR! NO SBOM_FILE AVAILABLE) -endif -SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) + SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata") + ifeq ($(strip $(SBOM_FILE)),) + $(error ERROR! NO SBOM_FILE AVAILABLE) + endif + SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) endif ifndef JDK_FILE -JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.tar.gz') -ifneq (,$(findstring win,$(SPEC))) -JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.zip') -endif -ifeq ($(strip $(JDK_FILE)),) -$(error ERROR! NO JDK_FILE AVAILABLE) -endif + JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.tar.gz') + ifneq (,$(findstring win,$(SPEC))) + JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.zip') + endif + ifeq ($(strip $(JDK_FILE)),) + $(error ERROR! NO JDK_FILE AVAILABLE) + endif endif ifneq (,$(findstring linux,$(SPEC))) -SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE)) + SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE)) endif RM_DEBUGINFO := $(shell find $(TEST_JDK_HOME) -type f -name "*.debuginfo" -delete) \ No newline at end of file From 37002918121aed5bb4f597349bd74ee2f00845dd Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Thu, 5 Dec 2024 10:08:25 -0500 Subject: [PATCH 5/6] update ERROR to info to avoid exit the test early Signed-off-by: Sophia Guo --- test/system/reproducibleCompare/reproducible.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/test/system/reproducibleCompare/reproducible.mk b/test/system/reproducibleCompare/reproducible.mk index 692fc9063..4870bed9a 100644 --- a/test/system/reproducibleCompare/reproducible.mk +++ b/test/system/reproducibleCompare/reproducible.mk @@ -14,9 +14,11 @@ ifndef SBOM_FILE SBOM_FILE := $(shell ls $(TEST_ROOT)/../jdkbinary/ | grep "sbom" | grep -v "metadata") ifeq ($(strip $(SBOM_FILE)),) - $(error ERROR! NO SBOM_FILE AVAILABLE) + $(info ERROR! NO SBOM_FILE AVAILABLE) + SBOM_FILE := + else + SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) endif - SBOM_FILE := $(TEST_ROOT)/../jdkbinary/$(SBOM_FILE) endif ifndef JDK_FILE @@ -25,12 +27,14 @@ ifndef JDK_FILE JDK_FILE := $(shell find $(TEST_ROOT)/../jdkbinary/ -type f -name '*-jdk_*.zip') endif ifeq ($(strip $(JDK_FILE)),) - $(error ERROR! NO JDK_FILE AVAILABLE) + $(info ERROR! NO JDK_FILE AVAILABLE) endif endif ifneq (,$(findstring linux,$(SPEC))) - SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE)) + ifneq ($(strip $(SBOM_FILE)),) + SBOM_FILE := $(subst $(TEST_ROOT)/../jdkbinary,/home/jenkins/test,$(SBOM_FILE)) + endif endif RM_DEBUGINFO := $(shell find $(TEST_JDK_HOME) -type f -name "*.debuginfo" -delete) \ No newline at end of file From 43050daa025bbaef2059179712c7fec95126a4eb Mon Sep 17 00:00:00 2001 From: Sophia Guo Date: Thu, 5 Dec 2024 10:17:04 -0500 Subject: [PATCH 6/6] update usage message --- tooling/reproducible/macos_repro_build_compare.sh | 2 +- tooling/reproducible/windows_repro_build_compare.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tooling/reproducible/macos_repro_build_compare.sh b/tooling/reproducible/macos_repro_build_compare.sh index 4831c76c5..18c976916 100755 --- a/tooling/reproducible/macos_repro_build_compare.sh +++ b/tooling/reproducible/macos_repro_build_compare.sh @@ -23,7 +23,7 @@ set -e # Check All 3 Params Are Supplied if [ "$#" -lt 3 ]; then - echo "Usage: $0 SBOM_URL/SBOM_PATH JDKZIP_URL/JDKZIP_PATH" + echo "Usage: $0 SBOM_URL/SBOM_PATH JDKZIP_URL/JDKZIP_PATH REPORT_DIR" echo "" echo "1. SBOM_URL/SBOM_PATH - should be the FULL path OR a URL to a Temurin JDK SBOM JSON file in CycloneDX Format" echo " eg. https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-sbom_x64_mac_hotspot_21.0.3_9.json" diff --git a/tooling/reproducible/windows_repro_build_compare.sh b/tooling/reproducible/windows_repro_build_compare.sh index 015e84611..186f44f89 100755 --- a/tooling/reproducible/windows_repro_build_compare.sh +++ b/tooling/reproducible/windows_repro_build_compare.sh @@ -20,7 +20,7 @@ set -e # Check All 3 Params Are Supplied if [ "$#" -lt 3 ]; then - echo "Usage: $0 SBOM_URL/SBOM_PATH JDKZIP_URL/JDKZIP_PATH" + echo "Usage: $0 SBOM_URL/SBOM_PATH JDKZIP_URL/JDKZIP_PATH REPORT_DIR" echo "" echo "1. SBOM_URL/SBOM_PATH - should be the FULL path OR a URL to a Temurin JDK SBOM JSON file in CycloneDX Format" echo " eg. https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-sbom_x64_windows_hotspot_21.0.2_13.json"