Skip to content

Commit

Permalink
Revert "chore(jenkins): Omit empty string default values"
Browse files Browse the repository at this point in the history
This reverts commit 7aac204 as it causes an NPE when triggering the job
programmatically:

    java.lang.NullPointerException
	at java.base/java.util.Objects.requireNonNull(Objects.java:209)
	at com.cloudbees.plugins.credentials.matchers.IdMatcher.<init>(IdMatcher.java:58)
	at com.cloudbees.plugins.credentials.CredentialsMatchers.withId(CredentialsMatchers.java:135)
	at com.cloudbees.plugins.credentials.CredentialsParameterValue.lookupCredentials(CredentialsParameterValue.java:111)

Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.org>
  • Loading branch information
sschuberth committed Dec 5, 2023
1 parent ba66567 commit bd6d9ec
Showing 1 changed file with 20 additions and 10 deletions.
30 changes: 20 additions & 10 deletions integrations/jenkins/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,15 @@ pipeline {

string(
name: 'PROJECT_VCS_REVISION',
description: 'Optional VCS revision of the project (prefix Git tags with "refs/tags/").'
description: 'Optional VCS revision of the project (prefix Git tags with "refs/tags/").',
defaultValue: ''
)

credentials(
name: 'PROJECT_VCS_CREDENTIALS',
credentialType: 'com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl',
description: 'Optional HTTP credentials to use for the VCS checkout.'
description: 'Optional HTTP credentials to use for the VCS checkout.',
defaultValue: ''
)

/*
Expand All @@ -77,23 +79,27 @@ pipeline {

string(
name: 'ORT_CONFIG_VCS_REVISION',
description: 'Optional VCS revision of the ORT configuration (prefix Git tags with "refs/tags/").'
description: 'Optional VCS revision of the ORT configuration (prefix Git tags with "refs/tags/").',
defaultValue: ''
)

string(
name: 'ORT_CONFIG_VCS_PATH',
description: 'Optional VCS path of the ORT configuration.'
description: 'Optional VCS path of the ORT configuration.',
defaultValue: ''
)

credentials(
name: 'ORT_CONFIG_VCS_CREDENTIALS',
credentialType: 'com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl',
description: 'Optional HTTP credentials to use for the VCS checkout.'
description: 'Optional HTTP credentials to use for the VCS checkout.',
defaultValue: ''
)

string(
name: 'ENVIRONMENT_VARIABLES',
description: 'Optional list of comma-separated key=value pairs of environment variables to set.'
description: 'Optional list of comma-separated key=value pairs of environment variables to set.',
defaultValue: ''
)

choice(
Expand Down Expand Up @@ -132,12 +138,14 @@ pipeline {

string(
name: 'ENABLED_PACKAGE_MANAGERS',
description: 'A comma-separated list of package managers to enable. By default all package managers are enabled.'
description: 'A comma-separated list of package managers to enable. By default all package managers are enabled.',
defaultValue: ''
)

string(
name: 'DISABLED_PACKAGE_MANAGERS',
description: 'A comma-separated list of package managers to disable. By default no package manager is disabled.'
description: 'A comma-separated list of package managers to disable. By default no package manager is disabled.',
defaultValue: ''
)

/*
Expand All @@ -164,7 +172,8 @@ pipeline {

string(
name: 'PROJECT_SCANNER_PLUGIN',
description: 'The scanner plugin to use for project source code. Overrides any built-in scanner.'
description: 'The scanner plugin to use for project source code. Overrides any built-in scanner.',
defaultValue: ''
)

choice(
Expand All @@ -175,7 +184,8 @@ pipeline {

string(
name: 'PACKAGE_SCANNER_PLUGIN',
description: 'The scanner plugin to use for package source code. Overrides any built-in scanner.'
description: 'The scanner plugin to use for package source code. Overrides any built-in scanner.',
defaultValue: ''
)

booleanParam(
Expand Down

0 comments on commit bd6d9ec

Please sign in to comment.