Prepare for git-commit-id plugin upgrade

We have an upgrade to 2.2.4 upcoming, which will eliminate gitid.skip
property. Add its replacement, so we are ready for that change.

Change-Id: I85a16b588a5a7b8312059170171353f3f8eb7e5c
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 1ce162a0f2628a83785ff43a88583885b0528abd..bac9e13d229c5471cff74a1a0976c5725fa44393 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -1514,6 +1514,7 @@
               clean install dependency:tree
               -Pq
               -Dgitid.skip=false
+              -Dmaven.gitcommitid.skip=false
               -DgenerateReports=false
               -Dstream={stream}
               {opendaylight-infra-mvn-opts}
@@ -1531,6 +1532,7 @@
               clean install dependency:tree
               -Pq
               -Dgitid.skip=false
+              -Dmaven.gitcommitid.skip=false
               {opendaylight-infra-mvn-opts}
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:

diff --git a/jjb/integration/multipatch-distribution.sh b/jjb/integration/multipatch-distribution.sh
index 0a0e355aa312db2719ea5154cfd748a082672670..95d4fedea2b18744e5c68c12c9fda8dab472046c 100644 (file)
--- a/jjb/integration/multipatch-distribution.sh
+++ b/jjb/integration/multipatch-distribution.sh
@@ -100,6 +100,7 @@ do
     -e -Pq \
     -Dstream=oxygen \
     -Dgitid.skip=false \
+    -Dmaven.gitcommitid.skip=false \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     $MAVEN_OPTIONS