Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: rename argument parameters #440

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pipelines/build/common/build_base_file.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ class Builder implements Serializable {
ENABLE_TESTDYNAMICPARALLEL: enableTestDynamicParallel,
ENABLE_INSTALLERS: enableInstallers,
ENABLE_SIGNER: enableSigner,
CLEAN_WORKSPACE: cleanWorkspace,
CLEAN_WORKSPACE_BEFORE_BUILD: cleanWorkspaceBeforeBuild,
sakshi1215 marked this conversation as resolved.
Show resolved Hide resolved
CLEAN_WORKSPACE_AFTER: cleanWsAfter,
CLEAN_WORKSPACE_BUILD_OUTPUT_ONLY_AFTER: cleanWorkspaceBuildOutputAfterBuild
)
Expand Down
2 changes: 1 addition & 1 deletion pipelines/build/common/config_regeneration.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -460,7 +460,7 @@ class Regeneration implements Serializable {
ENABLE_TESTDYNAMICPARALLEL: DEFAULTS_JSON['testDetails']['enableTestDynamicParallel'] as Boolean,
ENABLE_INSTALLERS: true,
ENABLE_SIGNER: true,
CLEAN_WORKSPACE: true,
CLEAN_WORKSPACE_BEFORE_BUILD: true,
CLEAN_WORKSPACE_AFTER: true,
CLEAN_WORKSPACE_BUILD_OUTPUT_ONLY_AFTER: false
)
Expand Down
2 changes: 1 addition & 1 deletion pipelines/build/common/create_job_from_template.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ pipelineJob("$buildFolder/$JOB_NAME") {
<dt><strong>ENABLE_TESTDYNAMICPARALLEL</strong></dt><dd>Run parallel</dd>
<dt><strong>ENABLE_INSTALLERS</strong></dt><dd>Run installers</dd>
<dt><strong>ENABLE_SIGNER</strong></dt><dd>Run signer</dd>
<dt><strong>CLEAN_WORKSPACE</strong></dt><dd>Wipe out workspace before build</dd>
<dt><strong>CLEAN_WORKSPACE_BEFORE_BUILD</strong></dt><dd>Wipe out workspace before build</dd>
<dt><strong>CLEAN_WORKSPACE_AFTER</strong></dt><dd>Wipe out workspace after build</dd>
<dt><strong>CLEAN_WORKSPACE_BUILD_OUTPUT_ONLY_AFTER</strong></dt><dd>Wipe out workspace build output only, after build</dd>
</dl>
Expand Down
2 changes: 1 addition & 1 deletion pipelines/build/common/openjdk_build_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ class Build {
def enableInstallers = Boolean.valueOf(buildConfig.ENABLE_INSTALLERS)
def enableSigner = Boolean.valueOf(buildConfig.ENABLE_SIGNER)
def useAdoptShellScripts = Boolean.valueOf(buildConfig.USE_ADOPT_SHELL_SCRIPTS)
def cleanWorkspace = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE)
def cleanWorkspace = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE_BEFORE_BUILD)
sakshi1215 marked this conversation as resolved.
Show resolved Hide resolved
def cleanWorkspaceAfter = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE_AFTER)
def cleanWorkspaceBuildOutputAfter = Boolean.valueOf(buildConfig.CLEAN_WORKSPACE_BUILD_OUTPUT_ONLY_AFTER)

Expand Down
2 changes: 1 addition & 1 deletion pipelines/build/openjdk_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ if (scmVars != null || configureBuild != null || buildConfigurations != null) {
aqaReference,
aqaAutoGen,
overridePublishName,
useAdoptBashScripts,
useAdoptShellScripts,
additionalConfigureArgs,
scmVars,
additionalBuildArgs,
Expand Down
2 changes: 1 addition & 1 deletion pipelines/jobs/pipeline_job_template.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ pipelineJob("${BUILD_FOLDER}/${JOB_NAME}") {
stringParam('additionalConfigureArgs', '', "Additional arguments that will be ultimately passed to OpenJDK's <code>./configure</code>")
stringParam('additionalBuildArgs', '', 'Additional arguments to be passed to <code>makejdk-any-platform.sh</code>')
stringParam('overrideFileNameVersion', '', "When forming the filename, ignore the part of the filename derived from the publishName or timestamp and override it.<br/>For instance if you set this to 'FOO' the final file name will be of the form: <code>OpenJDK8U-jre_ppc64le_linux_openj9_FOO.tar.gz</code>")
booleanParam('useAdoptBashScripts', adoptScripts, "If enabled, the downstream job will pull and execute <code>make-adopt-build-farm.sh</code> from adoptium/temurin-build. If disabled, it will use whatever the job is running inside of at the time, usually it's the default repository in the configuration.")
booleanParam('useAdoptShellScripts', adoptScripts, "If enabled, the downstream job will pull and execute <code>make-adopt-build-farm.sh</code> from adoptium/temurin-build. If disabled, it will use whatever the job is running inside of at the time, usually it's the default repository in the configuration.")
booleanParam('cleanWorkspaceBeforeBuild', false, 'Clean out the workspace before the build')
booleanParam('cleanWorkspaceAfterBuild', false, 'Clean out the workspace after the build')
booleanParam('cleanWorkspaceBuildOutputAfterBuild', cleanWsBuildOutput, 'Clean out the workspace/build/src/build and workspace/target output only, after the build')
Expand Down
2 changes: 1 addition & 1 deletion pipelines/src/test/groovy/IndividualBuildConfigTest.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class IndividualBuildConfigTest {
ENABLE_TESTS : true,
ENABLE_INSTALLERS : true,
ENABLE_SIGNER : true,
CLEAN_WORKSPACE : false,
CLEAN_WORKSPACE_BEFORE_BUILD : false,
CLEAN_WORKSPACE_AFTER : false,
CLEAN_WORKSPACE_BUILD_OUTPUT_ONLY_AFTER : false
])
Expand Down