From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Fri, 14 Jun 2019 23:07:47 +0000 (-0700)
Subject: Allow version-properties-file parameter
X-Git-Tag: v0.39.0~3
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=54f65edc2d552a099449a5cf1af2f0071fa722a6;p=releng%2Fglobal-jjb.git

Allow version-properties-file parameter

Some ONAP components like DCAEGEN2 do not host a version.properties file
in the root of their repos. We need to be able to provide a location and/or
different name for the version.properties file for jobs using the
lf-maven-versions-plugin builder step.

Issue: RELENG-2136
Change-Id: Ie5ae50887276bf8a4f8da3f865cf35e6a2292494
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---

diff --git a/docs/jjb/lf-maven-jobs.rst b/docs/jjb/lf-maven-jobs.rst
index 2a3d0c82..85bebcc7 100644
--- a/docs/jjb/lf-maven-jobs.rst
+++ b/docs/jjb/lf-maven-jobs.rst
@@ -69,6 +69,8 @@ Conditionally calls Maven versions plugin to set, update and commit the maven `v
 :Required Parameters:
 
     :maven-versions-plugin: Whether to call Maven versions plugin or not. (default: false)
+    :version-properties-file: Name and path of the version properties file.
+        (default: version.properties)
     :mvn-version: Version of Maven to execute Sonar with.
     :mvn-pom: Location of pom.xml.
     :mvn-settings: Maven settings.xml file containing credentials to use.
@@ -391,6 +393,8 @@ directory is then used later to deploy to Nexus.
         (default: 10)
     :submodule-disable: Disable submodule checkout operation.
         (default: false)
+    :version-properties-file: Name and path of the version properties file.
+        (default: version.properties)
 
     :gerrit_release_triggers: Override Gerrit Triggers.
     :gerrit_trigger_file_paths: Override file paths which can be used to
diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index abbf66e4..f8982c06 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -29,7 +29,7 @@
           condition-expression: '{maven-versions-plugin}'
           steps:
             - inject:
-                properties-file: version.properties
+                properties-file: '{version-properties-file}'
             - maven-target:
                 maven-version: '{mvn-version}'
                 pom: '{mvn-pom}'
@@ -815,6 +815,7 @@
     github-url: 'https://github.com'
     java-version: openjdk8
     maven-versions-plugin: false
+    version-properties-file: version.properties
     mvn-central: false
     mvn-global-settings: global-settings
     mvn-goals: clean deploy
@@ -883,6 +884,7 @@
           settings-file: '{mvn-settings}'
       - lf-maven-versions-plugin:
           maven-versions-plugin: '{maven-versions-plugin}'
+          version-properties-file: '{version-properties-file}'
           mvn-version: '{mvn-version}'
           mvn-pom: '{mvn-pom}'
           mvn-settings: '{mvn-settings}'
@@ -994,6 +996,7 @@
           settings-file: '{mvn-settings}'
       - lf-maven-versions-plugin:
           maven-versions-plugin: '{maven-versions-plugin}'
+          version-properties-file: '{version-properties-file}'
           mvn-version: '{mvn-version}'
           mvn-pom: '{mvn-pom}'
           mvn-settings: '{mvn-settings}'
diff --git a/releasenotes/notes/add-version-properties-file-param-0887e0a05782b6c5.yaml b/releasenotes/notes/add-version-properties-file-param-0887e0a05782b6c5.yaml
new file mode 100644
index 00000000..3c57b8a0
--- /dev/null
+++ b/releasenotes/notes/add-version-properties-file-param-0887e0a05782b6c5.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Some ONAP components like DCAEGEN2 do not host a version.properties file
+    in the root of their repos. We need to be able to provide a location and/or
+    different name for the version.properties file for jobs using the
+    lf-maven-versions-plugin builder step.