diff --git a/buildscripts/scripts/test-composition-single-f12less.groovy b/buildscripts/scripts/test-composition-single-f12less.groovy index ce3c81a7a54..559ec39cffb 100644 --- a/buildscripts/scripts/test-composition-single-f12less.groovy +++ b/buildscripts/scripts/test-composition-single-f12less.groovy @@ -7,6 +7,7 @@ def main() { "EDITION", "DISTRO", "USE_CASE", + "FAKE_WINDOWS_ARTIFACTS" ]); check_environment_variables([ @@ -19,6 +20,7 @@ def main() { def distro = params.DISTRO; def edition = params.EDITION; + def fake_windows_artifacts = params.FAKE_WINDOWS_ARTIFACTS; // TODO: we should always use USE_CASE directly from the job parameters def use_case = (params.USE_CASE == "fips") ? params.USE_CASE : "daily_tests" @@ -59,7 +61,8 @@ def main() { edition: edition, distro: distro, download_dir: download_dir, - bisect_comment: params.CIPARAM_BISECT_COMMENT + bisect_comment: params.CIPARAM_BISECT_COMMENT, + fake_windows_artifacts: fake_windows_artifacts ); } try { diff --git a/buildscripts/scripts/test-gui-e2e-f12less.groovy b/buildscripts/scripts/test-gui-e2e-f12less.groovy index 6643f70f356..5bb869b839f 100644 --- a/buildscripts/scripts/test-gui-e2e-f12less.groovy +++ b/buildscripts/scripts/test-gui-e2e-f12less.groovy @@ -6,6 +6,7 @@ def main() { check_job_parameters([ ["EDITION", true], // the testees package long edition string (e.g. 'enterprise') ["DISTRO", true], // the testees package distro string (e.g. 'ubuntu-22.04') + ["FAKE_WINDOWS_ARTIFACTS", true], // forwarded to package build job ["USE_CASE", false], // "CIPARAM_OVERRIDE_DOCKER_TAG_BUILD", // test base image tag (todo) // "DISABLE_CACHE", // forwarded to package build job (todo) @@ -21,6 +22,7 @@ def main() { def distro = params.DISTRO; def edition = params.EDITION; + def fake_windows_artifacts = params.FAKE_WINDOWS_ARTIFACTS; // TODO: we should always use USE_CASE directly from the job parameters def use_case = (params.USE_CASE == "fips") ? params.USE_CASE : "daily_tests" @@ -66,7 +68,8 @@ def main() { edition: edition, distro: distro, download_dir: download_dir, - bisect_comment: params.CIPARAM_BISECT_COMMENT + bisect_comment: params.CIPARAM_BISECT_COMMENT, + fake_windows_artifacts: fake_windows_artifacts ); } try { diff --git a/buildscripts/scripts/test-integration-single-f12less.groovy b/buildscripts/scripts/test-integration-single-f12less.groovy index 0c17b369e13..62df6a04081 100644 --- a/buildscripts/scripts/test-integration-single-f12less.groovy +++ b/buildscripts/scripts/test-integration-single-f12less.groovy @@ -6,6 +6,7 @@ def main() { check_job_parameters([ ["EDITION", true], // the testees package long edition string (e.g. 'enterprise') ["DISTRO", true], // the testees package distro string (e.g. 'ubuntu-22.04') + ["FAKE_WINDOWS_ARTIFACTS", true], // forwarded to package build job // "CIPARAM_OVERRIDE_DOCKER_TAG_BUILD", // test base image tag (todo) // "DISABLE_CACHE", // forwarded to package build job (todo) ]); @@ -18,6 +19,7 @@ def main() { def distro = params.DISTRO; def edition = params.EDITION; + def fake_windows_artifacts = params.FAKE_WINDOWS_ARTIFACTS def make_target = "test-integration-docker"; def download_dir = "package_download"; @@ -52,7 +54,8 @@ def main() { edition: edition, distro: distro, download_dir: download_dir, - bisect_comment: params.CIPARAM_BISECT_COMMENT + bisect_comment: params.CIPARAM_BISECT_COMMENT, + fake_windows_artifacts: fake_windows_artifacts ); } try { diff --git a/buildscripts/scripts/test-update-single-f12less.groovy b/buildscripts/scripts/test-update-single-f12less.groovy index e8bbef2dcb8..a9bdcbeb8b3 100644 --- a/buildscripts/scripts/test-update-single-f12less.groovy +++ b/buildscripts/scripts/test-update-single-f12less.groovy @@ -28,6 +28,7 @@ def main() { check_job_parameters([ ["EDITION", true], // the testees package long edition string (e.g. 'enterprise') ["DISTRO", true], // the testees package distro string (e.g. 'ubuntu-22.04') + "FAKE_WINDOWS_ARTIFACTS", "VERSION", ]); @@ -43,6 +44,7 @@ def main() { def version = params.VERSION; def distro = params.DISTRO; def edition = params.EDITION; + def fake_windows_artifacts = params.FAKE_WINDOWS_ARTIFACTS; def cross_edition_target = params.CROSS_EDITION_TARGET ?: ""; if (cross_edition_target) { @@ -82,7 +84,8 @@ def main() { edition: edition, distro: distro, download_dir: download_dir, - bisect_comment: params.CIPARAM_BISECT_COMMENT + bisect_comment: params.CIPARAM_BISECT_COMMENT, + fake_windows_artifacts: fake_windows_artifacts ); } try { diff --git a/buildscripts/scripts/utils/single_tests.groovy b/buildscripts/scripts/utils/single_tests.groovy index 9ed72c503e3..7795beeb18a 100644 --- a/buildscripts/scripts/utils/single_tests.groovy +++ b/buildscripts/scripts/utils/single_tests.groovy @@ -81,6 +81,7 @@ def fetch_package(Map args) { EDITION: args.edition, DISTRO: args.distro, CIPARAM_BISECT_COMMENT: args.bisect_comment, + FAKE_WINDOWS_ARTIFACTS: args.fake_windows_artifacts, ], build_params_no_check: [ CIPARAM_OVERRIDE_BUILD_NODE: build_node,