diff --git a/jenkins_jobs/modules/wrappers.py b/jenkins_jobs/modules/wrappers.py index 21ed79b8e..0db54a055 100644 --- a/jenkins_jobs/modules/wrappers.py +++ b/jenkins_jobs/modules/wrappers.py @@ -2358,6 +2358,8 @@ def version_number(parser, xml_parent, data): number to (required) :arg str format-string: Format string used to generate version number (required) + :arg str prefix-variable: Variable that contains version number prefix + (optional) :arg bool skip-failed-builds: If the build fails, DO NOT increment any auto-incrementing component of the version number (default: false) :arg bool display-name: Use the version number for the build display @@ -2387,6 +2389,7 @@ def version_number(parser, xml_parent, data): # option, xml name, default value ("variable-name", 'environmentVariableName', None), ("format-string", 'versionNumberString', None), + ("prefix-variable", 'environmentPrefixVariable', ''), ("skip-failed-builds", 'skipFailedBuilds', False), ("display-name", 'useAsBuildDisplayName', False), ("start-date", 'projectStartDate', '1970-1-1 00:00:00.0 UTC'), diff --git a/tests/wrappers/fixtures/version-number001.xml b/tests/wrappers/fixtures/version-number001.xml index 9d2b9c2ce..feee536f8 100644 --- a/tests/wrappers/fixtures/version-number001.xml +++ b/tests/wrappers/fixtures/version-number001.xml @@ -4,6 +4,7 @@ relVersion ${BUILD_DATE_FORMATTED, "yy.M"}.${BUILDS_THIS_MONTH_Z} + relVersion false false 1970-1-1 00:00:00.0 UTC diff --git a/tests/wrappers/fixtures/version-number001.yaml b/tests/wrappers/fixtures/version-number001.yaml index f55d06c21..eda13f45f 100644 --- a/tests/wrappers/fixtures/version-number001.yaml +++ b/tests/wrappers/fixtures/version-number001.yaml @@ -1,4 +1,5 @@ wrappers: - version-number: variable-name: relVersion + prefix-variable: relVersion format-string: ${BUILD_DATE_FORMATTED, "yy.M"}.${BUILDS_THIS_MONTH_Z}