From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Tue, 14 May 2019 18:59:14 +0000 (-0700)
Subject: Fix builder steps in lf-maven-docker-stage
X-Git-Tag: v0.38.0~9^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F72%2F15672%2F2;p=releng%2Fglobal-jjb.git

Fix builder steps in lf-maven-docker-stage

lf-maven-versions-plugin builder step needs to run before
maven-patch-release.sh as this second script contains a
condition to confirm if the maven vesions plugin was selected
as a way to remove the 'SNAPSHOT' pattern from the pom.xml
files.
lf-maven-docker-stage was based on lf-maven-stage and it
seems that these particular builder steps were switched in
place accidentally.

Change-Id: I30ac4af2a7566cb2c1072412a738f38d4f3318fb
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 7c47aece..aa6904b1 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -992,12 +992,12 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - lf-maven-versions-plugin:
           maven-versions-plugin: '{maven-versions-plugin}'
           mvn-version: '{mvn-version}'
           mvn-pom: '{mvn-pom}'
           mvn-settings: '{mvn-settings}'
+      - shell: !include-raw-escape: ../shell/maven-patch-release.sh
       - inject:
           properties-content: |
               CONTAINER_PULL_REGISTRY={container-public-registry}
diff --git a/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml b/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml
new file mode 100644
index 00000000..d00cb25e
--- /dev/null
+++ b/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    lf-maven-versions-plugin builder step needs to run before maven-patch-release.sh
+    as this second script contains a condition to confirm if the maven vesions
+    plugin was selected as a way to remove the 'SNAPSHOT' pattern from the pom.xml
+    files.
+    lf-maven-docker-stage was based on lf-maven-stage and it seems that these particular
+    builder steps were switched in place accidentally.