Skip to content

Commit 210b215

Browse files
pshiptonpshipton
committed
Pass VENDOR_CODE parameters to build jobs
Signed-off-by: Peter Shipton <[email protected]>
1 parent d01df7a commit 210b215

File tree

5 files changed

+72
-12
lines changed

5 files changed

+72
-12
lines changed

‎buildenv/jenkins/common/build.groovy

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,18 @@ def get_source() {
3737
OMR_BRANCH_OPTION = (OMR_BRANCH != "")? "-omr-branch=${OMR_BRANCH}" : ""
3838
OMR_SHA_OPTION = (OMR_SHA != "") ? "-omr-sha=${OMR_SHA}" : ""
3939

40+
VENDOR_CODE_REPO_OPTION = (VENDOR_CODE_REPO != "") ? "-vendor-code-repo=${VENDOR_CODE_REPO}" : ""
41+
VENDOR_CODE_BRANCH_OPTION = (VENDOR_CODE_BRANCH != "") ? "-vendor-code-branch=${VENDOR_CODE_BRANCH}" : ""
42+
VENDOR_CODE_SHA_OPTION = (VENDOR_CODE_SHA != "") ? "-vendor-code-sha=${VENDOR_CODE_SHA}" : ""
43+
4044
if (OPENJDK_REFERENCE_REPO) {
4145
OPENJ9_REFERENCE = "-openj9-reference=${OPENJDK_REFERENCE_REPO}"
4246
OMR_REFERENCE = "-omr-reference=${OPENJDK_REFERENCE_REPO}"
47+
if (SDK_VERSION == "8" || SPEC.contains('zos')) {
48+
VENDOR_CODE_REFERENCE = "-vendor-code-reference=${OPENJDK_REFERENCE_REPO}"
49+
} else {
50+
VENDOR_CODE_REFERENCE = ""
51+
}
4352
}
4453

4554
// use sshagent with Jenkins credentials ID for all platforms except zOS
@@ -59,7 +68,7 @@ def get_sources_with_authentication() {
5968
}
6069

6170
def get_source_call(gskit_cred="") {
62-
sh "bash get_source.sh ${EXTRA_GETSOURCE_OPTIONS} ${gskit_cred} ${OPENJ9_REPO_OPTION} ${OPENJ9_BRANCH_OPTION} ${OPENJ9_SHA_OPTION} ${OPENJ9_REFERENCE} ${OMR_REPO_OPTION} ${OMR_BRANCH_OPTION} ${OMR_SHA_OPTION} ${OMR_REFERENCE}"
71+
sh "bash get_source.sh ${EXTRA_GETSOURCE_OPTIONS} ${gskit_cred} ${OPENJ9_REPO_OPTION} ${OPENJ9_BRANCH_OPTION} ${OPENJ9_SHA_OPTION} ${OPENJ9_REFERENCE} ${OMR_REPO_OPTION} ${OMR_BRANCH_OPTION} ${OMR_SHA_OPTION} ${OMR_REFERENCE} ${VENDOR_CODE_REPO_OPTION} ${VENDOR_CODE_BRANCH_OPTION} ${VENDOR_CODE_SHA_OPTION} ${VENDOR_CODE_REFERENCE}"
6372
}
6473

6574
def get_source_call_optional_gskit() {

‎buildenv/jenkins/common/pipeline-functions.groovy

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
* SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0 OR GPL-2.0-only WITH OpenJDK-assembly-exception-1.0
2121
*******************************************************************************/
2222

23-
def get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_TEST_REPOS_MAP=null, VENDOR_TEST_BRANCHES_MAP=null, VENDOR_TEST_SHAS_MAP=null) {
23+
def get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, VENDOR_TEST_REPOS_MAP=null, VENDOR_TEST_BRANCHES_MAP=null, VENDOR_TEST_SHAS_MAP=null) {
2424
// Get a set of SHAs for a standard OpenJ9 build
2525
def SHAS = [:]
2626

@@ -67,7 +67,6 @@ def get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO,
6767
echo "OPENJDK_SHA:${SHAS['OPENJDK']}"
6868
}
6969

70-
// fetch extensions SHAs
7170
SHAS['OPENJ9'] = OPENJ9_SHA
7271
if (!SHAS['OPENJ9'] && (OPENJ9_REPO && OPENJ9_BRANCH)) {
7372
SHAS['OPENJ9'] = get_repository_sha(OPENJ9_REPO, OPENJ9_BRANCH)
@@ -78,9 +77,15 @@ def get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO,
7877
SHAS['OMR'] = get_repository_sha(OMR_REPO, OMR_BRANCH)
7978
}
8079

80+
SHAS['VENDOR_CODE'] = VENDOR_CODE_SHA
81+
if (!SHAS['VENDOR_CODE'] && (VENDOR_CODE_REPO && VENDOR_CODE_BRANCH)) {
82+
SHAS['VENDOR_CODE'] = get_repository_sha(VENDOR_CODE_REPO, VENDOR_CODE_BRANCH)
83+
}
84+
8185
// Write the SHAs to the Build Description
8286
echo "OPENJ9_SHA:${SHAS['OPENJ9']}"
8387
echo "OMR_SHA:${SHAS['OMR']}"
88+
echo "VENDOR_CODE_SHA:${SHAS['VENDOR_CODE']}"
8489
def TMP_DESC = (currentBuild.description) ? currentBuild.description + "<br>" : ""
8590
currentBuild.description = TMP_DESC + "OpenJ9: <a href=${get_http_repo_url(OPENJ9_REPO)}/commit/${SHAS['OPENJ9']}>${get_short_sha(SHAS['OPENJ9'])}</a><br/>OMR: <a href=${get_http_repo_url(OMR_REPO)}/commit/${SHAS['OMR']}>${get_short_sha(SHAS['OMR'])}</a>${description}"
8691

@@ -183,7 +188,7 @@ def cancel_running_builds(JOB_NAME, BUILD_IDENTIFIER) {
183188
echo "Done stopping jobs"
184189
}
185190

186-
def build(BUILD_JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, OPENJDK_SHA, OPENJ9_REPO, OPENJ9_BRANCH, OPENJ9_SHA, OMR_REPO, OMR_BRANCH, OMR_SHA, VARIABLE_FILE, VENDOR_REPO, VENDOR_BRANCH, VENDOR_CREDENTIALS_ID, NODE, SETUP_LABEL, BUILD_IDENTIFIER, ghprbGhRepository, ghprbActualCommit, GITHUB_SERVER, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, CUSTOM_DESCRIPTION, ghprbPullId, ghprbCommentBody, ghprbTargetBranch, ARCHIVE_JAVADOC, CODE_COVERAGE) {
191+
def build(BUILD_JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, OPENJDK_SHA, OPENJ9_REPO, OPENJ9_BRANCH, OPENJ9_SHA, OMR_REPO, OMR_BRANCH, OMR_SHA, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, VENDOR_CODE_SHA, VARIABLE_FILE, VENDOR_REPO, VENDOR_BRANCH, VENDOR_CREDENTIALS_ID, NODE, SETUP_LABEL, BUILD_IDENTIFIER, ghprbGhRepository, ghprbActualCommit, GITHUB_SERVER, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, CUSTOM_DESCRIPTION, ghprbPullId, ghprbCommentBody, ghprbTargetBranch, ARCHIVE_JAVADOC, CODE_COVERAGE) {
187192
stage ("${BUILD_JOB_NAME}") {
188193
return build_with_slack(BUILD_JOB_NAME, ghprbGhRepository, ghprbActualCommit, GITHUB_SERVER,
189194
[string(name: 'OPENJDK_REPO', value: OPENJDK_REPO),
@@ -195,6 +200,9 @@ def build(BUILD_JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, OPENJDK_SHA, OPENJ9_REPO
195200
string(name: 'OMR_REPO', value: OMR_REPO),
196201
string(name: 'OMR_BRANCH', value: OMR_BRANCH),
197202
string(name: 'OMR_SHA', value: OMR_SHA),
203+
string(name: 'VENDOR_CODE_REPO', value: VENDOR_CODE_REPO),
204+
string(name: 'VENDOR_CODE_BRANCH', value: VENDOR_CODE_BRANCH),
205+
string(name: 'VENDOR_CODE_SHA', value: VENDOR_CODE_SHA),
198206
string(name: 'VARIABLE_FILE', value: VARIABLE_FILE),
199207
string(name: 'VENDOR_REPO', value: VENDOR_REPO),
200208
string(name: 'VENDOR_BRANCH', value: VENDOR_BRANCH),
@@ -366,7 +374,7 @@ def build_with_slack(DOWNSTREAM_JOB_NAME, ghprbGhRepository, ghprbActualCommit,
366374
return JOB
367375
}
368376

369-
def workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, TESTS_TARGETS, VENDOR_TEST_REPOS_MAP, VENDOR_TEST_BRANCHES_MAP, VENDOR_TEST_DIRS_MAP, USER_CREDENTIALS_ID, SETUP_LABEL, ghprbGhRepository, ghprbActualCommit, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTION, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, BUILD_JOB_NAME, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES) {
377+
def workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, TESTS_TARGETS, VENDOR_TEST_REPOS_MAP, VENDOR_TEST_BRANCHES_MAP, VENDOR_TEST_DIRS_MAP, USER_CREDENTIALS_ID, SETUP_LABEL, ghprbGhRepository, ghprbActualCommit, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTION, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, BUILD_JOB_NAME, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES) {
370378
def jobs = [:]
371379

372380
// Set ghprbGhRepository and ghprbActualCommit for the purposes of Github commit status updates
@@ -380,7 +388,7 @@ def workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO,
380388
echo "Repo:${ghprbGhRepository}, Commit:${ghprbActualCommit}, GITHUB_SERVER:${GITHUB_SERVER}"
381389

382390
// compile the source and build the SDK
383-
jobs["build"] = build(BUILD_JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, SHAS['OPENJDK'], OPENJ9_REPO, OPENJ9_BRANCH, SHAS['OPENJ9'], OMR_REPO, OMR_BRANCH, SHAS['OMR'], params.VARIABLE_FILE, params.VENDOR_REPO, params.VENDOR_BRANCH, params.VENDOR_CREDENTIALS_ID, params.BUILD_NODE, SETUP_LABEL, BUILD_IDENTIFIER, ghprbGhRepository, ghprbActualCommit, GITHUB_SERVER, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, CUSTOM_DESCRIPTION, ghprbPullId, ghprbCommentBody, ghprbTargetBranch, ARCHIVE_JAVADOC, CODE_COVERAGE)
391+
jobs["build"] = build(BUILD_JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, SHAS['OPENJDK'], OPENJ9_REPO, OPENJ9_BRANCH, SHAS['OPENJ9'], OMR_REPO, OMR_BRANCH, SHAS['OMR'], VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, SHAS['VENDOR_CODE'], params.VARIABLE_FILE, params.VENDOR_REPO, params.VENDOR_BRANCH, params.VENDOR_CREDENTIALS_ID, params.BUILD_NODE, SETUP_LABEL, BUILD_IDENTIFIER, ghprbGhRepository, ghprbActualCommit, GITHUB_SERVER, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, CUSTOM_DESCRIPTION, ghprbPullId, ghprbCommentBody, ghprbTargetBranch, ARCHIVE_JAVADOC, CODE_COVERAGE)
384392

385393
// Determine if Build job archived to Artifactory
386394
def BUILD_JOB_ENV = jobs["build"].getBuildVariables()
@@ -817,7 +825,7 @@ def build_all() {
817825
variableFile.create_job(BUILD_NAME, SDK_VERSION, SPEC, 'build', buildFile.convert_build_identifier(BUILD_IDENTIFIER))
818826
}
819827
}
820-
jobs = buildFile.workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, TESTS_TARGETS, VENDOR_TEST_REPOS_MAP, VENDOR_TEST_BRANCHES_MAP, VENDOR_TEST_DIRS_MAP, USER_CREDENTIALS_ID, SETUP_LABEL, ghprbGhRepository, ghprbActualCommit, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, BUILD_NAME, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES)
828+
jobs = buildFile.workflow(SDK_VERSION, SPEC, SHAS, OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, TESTS_TARGETS, VENDOR_TEST_REPOS_MAP, VENDOR_TEST_BRANCHES_MAP, VENDOR_TEST_DIRS_MAP, USER_CREDENTIALS_ID, SETUP_LABEL, ghprbGhRepository, ghprbActualCommit, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, BUILD_NAME, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES)
821829
} finally {
822830
//display the build status of the downstream jobs
823831
def downstreamBuilds = get_downstream_builds(currentBuild, currentBuild.projectName, get_downstream_job_names(SPEC, SDK_VERSION, BUILD_IDENTIFIER).values())

‎buildenv/jenkins/common/variables-functions.groovy

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ def set_repos_variables(BUILD_SPECS=null) {
308308

309309
// default URL and branch for the OpenJ9 and OMR repositories (no entries in defaults.yml)
310310
EXTENSIONS = ['OpenJ9': ['repo': 'https://github.com/eclipse-openj9/openj9.git', 'branch': 'master'],
311-
'OMR' : ['repo': 'https://github.com/eclipse-openj9/openj9-omr.git', 'branch': 'openj9']]
311+
'OMR' : ['repo': 'https://github.com/eclipse-openj9/openj9-omr.git', 'branch': 'openj9'],
312+
'VENDOR_CODE' : ['repo': '', 'branch': '']]
312313

313314
// set OpenJ9 and OMR repos, branches and SHAs
314315
set_extensions_variables(EXTENSIONS)
@@ -465,8 +466,41 @@ def set_extensions_variables(defaults=null) {
465466
OMR_SHA = ''
466467
}
467468

469+
VENDOR_CODE_REPO = params.VENDOR_CODE_REPO
470+
if (!VENDOR_CODE_REPO) {
471+
// set it to the value set into the variable file
472+
VENDOR_CODE_REPO = VARIABLES.vendor_code_repo
473+
}
474+
475+
if (!VENDOR_CODE_REPO) {
476+
VENDOR_CODE_REPO = ''
477+
if (defaults) {
478+
VENDOR_CODE_REPO = defaults.get('VENDOR_CODE').get('repo')
479+
}
480+
}
481+
VENDOR_CODE_REPO = convert_url(VENDOR_CODE_REPO)
482+
483+
VENDOR_CODE_BRANCH = params.VENDOR_CODE_BRANCH
484+
if (!VENDOR_CODE_BRANCH) {
485+
// set it to the value set into the variable file
486+
VENDOR_CODE_BRANCH = VARIABLES.vendor_code_branch
487+
}
488+
489+
if (!VENDOR_CODE_BRANCH) {
490+
VENDOR_CODE_BRANCH = ''
491+
if (defaults) {
492+
VENDOR_CODE_BRANCH = defaults.get('VENDOR_CODE').get('branch')
493+
}
494+
}
495+
496+
VENDOR_CODE_SHA = params.VENDOR_CODE_SHA
497+
if (!VENDOR_CODE_SHA) {
498+
VENDOR_CODE_SHA = ''
499+
}
500+
468501
echo "Using OPENJ9_REPO = ${OPENJ9_REPO} OPENJ9_BRANCH = ${OPENJ9_BRANCH} OPENJ9_SHA = ${OPENJ9_SHA}"
469502
echo "Using OMR_REPO = ${OMR_REPO} OMR_BRANCH = ${OMR_BRANCH} OMR_SHA = ${OMR_SHA}"
503+
echo "Using VENDOR_CODE_REPO = ${VENDOR_CODE_REPO} VENDOR_CODE_BRANCH = ${VENDOR_CODE_BRANCH} VENDOR_CODE_SHA = ${VENDOR_CODE_SHA}"
470504
}
471505

472506
/*
@@ -1013,7 +1047,7 @@ def setup() {
10131047
// pipelineFunctions already loads pipeline-functions, so in this case let's just dup the variable buildFile
10141048
// TODO revisit all the loads and try to optimize.
10151049
buildFile = pipelineFunctions
1016-
SHAS = buildFile.get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_TEST_REPOS_MAP, VENDOR_TEST_BRANCHES_MAP, VENDOR_TEST_SHAS_MAP)
1050+
SHAS = buildFile.get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, VENDOR_TEST_REPOS_MAP, VENDOR_TEST_BRANCHES_MAP, VENDOR_TEST_SHAS_MAP)
10171051
BUILD_NAME = buildFile.get_build_job_name(SPEC, SDK_VERSION, BUILD_IDENTIFIER)
10181052
// Stash DSL file so we can quickly load it on the Jenkins Manager node
10191053
if (params.AUTOMATIC_GENERATION != 'false') {

‎buildenv/jenkins/jobs/pipelines/Pipeline-Build-Test-All.groovy

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@
3737
* OMR_SHA: String - the last commit SHA of the OMR repository
3838
* ADOPTOPENJDK_REPO: String - the Adoptium AQA testing repository URL: e.g. https://github.com/adoptium/aqa-tests.git
3939
* ADOPTOPENJDK_BRANCH: String - the Adoptium AQA testing branch: e.g. master
40+
* VENDOR_CODE_REPO: String - the vendor code git repository URL
41+
* VENDOR_CODE_BRANCH: String - the vendor code branch to clone from: e.g. master (no default)
42+
* VENDOR_CODE_SHA: String - the last commit SHA of the vendor code repository
4043
* TESTS_TARGETS: String - The test targets to run. Expected values: _sanity, _extended, none
4144
* VARIABLE_FILE: String - the custom variables file. Uses defaults.yml when no value is provided.
4245
* VENDOR_REPO: String - the repository URL of a Git repository that stores a custom variables file
@@ -302,7 +305,7 @@ try {
302305
// parse variables file and initialize variables
303306
variableFile.set_job_variables('wrapper')
304307

305-
SHAS = buildFile.get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH)
308+
SHAS = buildFile.get_shas(OPENJDK_REPO, OPENJDK_BRANCH, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH)
306309

307310
if (PERSONAL_BUILD.equalsIgnoreCase('true')) {
308311
// update build description
@@ -350,7 +353,7 @@ try {
350353
}
351354
}
352355
pipelinesStatus[job_name] = 'RUNNING'
353-
build(job_name, REPO, BRANCH, SHAS, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, SPEC, SDK_VERSION, BUILD_NODE, TEST_NODE, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, AUTOMATIC_GENERATION, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES)
356+
build(job_name, REPO, BRANCH, SHAS, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, SPEC, SDK_VERSION, BUILD_NODE, TEST_NODE, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, AUTOMATIC_GENERATION, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES)
354357
}
355358
}
356359
}
@@ -414,7 +417,7 @@ try {
414417
draw_summary_table()
415418
}
416419

417-
def build(JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, SHAS, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, SPEC, SDK_VERSION, BUILD_NODE, TEST_NODE, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, AUTOMATIC_GENERATION, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES) {
420+
def build(JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, SHAS, OPENJ9_REPO, OPENJ9_BRANCH, OMR_REPO, OMR_BRANCH, VENDOR_CODE_REPO, VENDOR_CODE_BRANCH, OPENJ9_REPO, SPEC, SDK_VERSION, BUILD_NODE, TEST_NODE, EXTRA_GETSOURCE_OPTIONS, EXTRA_CONFIGURE_OPTIONS, EXTRA_MAKE_OPTIONS, OPENJDK_CLONE_DIR, ADOPTOPENJDK_REPO, ADOPTOPENJDK_BRANCH, AUTOMATIC_GENERATION, CUSTOM_DESCRIPTION, ARCHIVE_JAVADOC, CODE_COVERAGE, USE_TESTENV_PROPERTIES) {
418421
stage ("${JOB_NAME}") {
419422
JOB = build job: JOB_NAME,
420423
parameters: [
@@ -427,6 +430,9 @@ def build(JOB_NAME, OPENJDK_REPO, OPENJDK_BRANCH, SHAS, OPENJ9_REPO, OPENJ9_BRAN
427430
string(name: 'OMR_REPO', value: OMR_REPO),
428431
string(name: 'OMR_BRANCH', value: OMR_BRANCH),
429432
string(name: 'OMR_SHA', value: SHAS['OMR']),
433+
string(name: 'VENDOR_CODE_REPO', value: VENDOR_CODE_REPO),
434+
string(name: 'VENDOR_CODE_BRANCH', value: VENDOR_CODE_BRANCH),
435+
string(name: 'VENDOR_CODE_SHA', value: SHAS['VENDOR_CODE']),
430436
string(name: 'ADOPTOPENJDK_REPO', value: ADOPTOPENJDK_REPO),
431437
string(name: 'ADOPTOPENJDK_BRANCH', value: ADOPTOPENJDK_BRANCH),
432438
string(name: 'TESTS_TARGETS', value: TESTS_TARGETS),

‎buildenv/jenkins/jobs/pipelines/Pipeline_Template.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,9 @@ pipelineJob("$JOB_NAME") {
8383
stringParam('OMR_REPO')
8484
stringParam('OMR_BRANCH')
8585
stringParam('OMR_SHA')
86+
stringParam('VENDOR_CODE_REPO')
87+
stringParam('VENDOR_CODE_BRANCH')
88+
stringParam('VENDOR_CODE_SHA')
8689
stringParam('ADOPTOPENJDK_REPO')
8790
stringParam('ADOPTOPENJDK_BRANCH')
8891
stringParam('VARIABLE_FILE', VARIABLE_FILE_DEFAULT)

0 commit comments

Comments
 (0)