Skip to content

Commit

Permalink
Forward fake artifacts in single f12less jobs
Browse files Browse the repository at this point in the history
CMK-21338

Change-Id: I1800dcc87c285943421df2b52acd189c2d351474
  • Loading branch information
TimotheusBachinger committed Jan 31, 2025
1 parent 59ddde6 commit d2fb8f3
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 4 deletions.
5 changes: 4 additions & 1 deletion buildscripts/scripts/test-composition-single-f12less.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ def main() {
"EDITION",
"DISTRO",
"USE_CASE",
"FAKE_WINDOWS_ARTIFACTS"
]);

check_environment_variables([
Expand All @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion buildscripts/scripts/test-gui-e2e-f12less.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion buildscripts/scripts/test-integration-single-f12less.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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)
]);
Expand All @@ -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";
Expand Down Expand Up @@ -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 {
Expand Down
5 changes: 4 additions & 1 deletion buildscripts/scripts/test-update-single-f12less.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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",
]);

Expand All @@ -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) {
Expand Down Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions buildscripts/scripts/utils/single_tests.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit d2fb8f3

Please sign in to comment.