From 2cfbc8e3729084469929d6427636dc88381a3746 Mon Sep 17 00:00:00 2001 From: Lan Xia Date: Fri, 1 Nov 2024 10:14:35 -0400 Subject: [PATCH] Fix vendor repo missing issue for regular test builds resovles: automation/issues/103 Signed-off-by: Lan Xia --- .../common/openjdk_build_pipeline.groovy | 24 ++++++++++++------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/pipelines/build/common/openjdk_build_pipeline.groovy b/pipelines/build/common/openjdk_build_pipeline.groovy index 32bbea971..1217b500a 100644 --- a/pipelines/build/common/openjdk_build_pipeline.groovy +++ b/pipelines/build/common/openjdk_build_pipeline.groovy @@ -502,10 +502,14 @@ class Build { def VENDOR_TEST_BRANCHES = '' def VENDOR_TEST_DIRS = '' if ("${testType}".contains('functional')) { - if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) { - VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/test.git' - VENDOR_TEST_BRANCHES = aqaBranch - VENDOR_TEST_DIRS = 'functional' + VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/test.git' + VENDOR_TEST_BRANCHES = aqaBranch + VENDOR_TEST_DIRS = 'functional' + // do not set functional vendor repo for FIPS + if (fipsTestBuildSuffix && "${fipsTestBuildSuffix}".contains("fips")) { + VENDOR_TEST_REPOS = '' + VENDOR_TEST_BRANCHES = '' + VENDOR_TEST_DIRS = '' } customizedSdkUrl += " " + testimageUrl } else if ("${testType}".contains('jck')) { @@ -513,10 +517,14 @@ class Build { VENDOR_TEST_BRANCHES = "main" VENDOR_TEST_DIRS = 'jck' } else if ("${testType}".contains('special.openjdk')) { - if (fipsTestBuildSuffix && !"${fipsTestBuildSuffix}".contains("fips")) { - VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/osb-tests.git' - VENDOR_TEST_BRANCHES = "ibm_tlda" - VENDOR_TEST_DIRS = 'openjdk' + VENDOR_TEST_REPOS = 'git@github.ibm.com:runtimes/osb-tests.git' + VENDOR_TEST_BRANCHES = "ibm_tlda" + VENDOR_TEST_DIRS = 'openjdk' + // do not set openjdk vendor repo for FIPS + if (fipsTestBuildSuffix && "${fipsTestBuildSuffix}".contains("fips")) { + VENDOR_TEST_REPOS = '' + VENDOR_TEST_BRANCHES = '' + VENDOR_TEST_DIRS = '' } }