Move all maven definitions to variables

* Make sure that the maven version is not hard coded into any templates
  or macros

* Set a global default maven version so that projects do not need to
  define it unless they need a different version from the default

Change-Id: Ifd7dfe2e521fd88b52de96a00a3ef63953d4f682
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 662e9c5..50f45be 100644 (file)
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -76,8 +76,7 @@
       - ci-management-check-unicode
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#       - ecomp-infra-shiplogs
 
 - job-template:
     name: '{project}-merge-jjb'
@@ -126,8 +125,7 @@
           jenkins-jobs --conf $JJBINI update --delete-old --workers 4 jjb/
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#       - ecomp-infra-shiplogs
 
 - job-template:
     name: '{project}-verify-packer'
@@ -166,8 +164,7 @@
       - packer-validate
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#       - ecomp-infra-shiplogs
 
 - job-template:
     name: '{project}-merge-packer-{platforms}-{templates}'
@@ -209,5 +206,4 @@
           template: '{templates}'
 
 #     publishers:
-#       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#       - ecomp-infra-shiplogs

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index 3c021c7..bc7560d 100644 (file)
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -19,3 +19,6 @@
     build-node: ubuntu1604-basebuild-2c-1g
 
     archive-artifacts: ''
+
+    # Set default maven version used for everything
+    maven-version: 'mvn33'

diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index 460bb3a..2d2d6c3 100644 (file)
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -24,7 +24,7 @@
     name: maven-docker-push-release
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: '{pom}'
           goals: 'clean deploy -B -P {mvn-profile}'
           settings: '{mvn-settings}'
@@ -40,7 +40,7 @@
     name: maven-docker-push-daily
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: '{pom}'
           goals: 'clean deploy -B -P {mvn-profile}'
           settings: '{mvn-settings}'

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 92eeb26..4423d20 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -25,7 +25,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -48,7 +48,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: 'clean install -DskipTests=true'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -59,7 +59,7 @@
 
 #     publishers:
 #       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#           maven-version: '{maven-version}'
 
 
 - job-template:
@@ -88,7 +88,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -111,7 +111,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: 'clean install'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -120,7 +120,7 @@
 
 #     publishers:
 #       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#           maven-version: '{maven-version}'
 
 - job-template:
     # Job template for Java verify jobs with POM not at the root
@@ -151,7 +151,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -174,7 +174,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: '{pom}'
           goals: 'clean install'
           settings: '{mvn-settings}'
@@ -184,7 +184,7 @@
 
 #     publishers:
 #       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#           maven-version: '{maven-version}'
 
 - job-template:
     # Job template for Java daily release jobs
@@ -210,7 +210,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -235,7 +235,7 @@
           settings-file: '{mvn-settings}'
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
           properties:
             - '{maven-deploy-properties}'
@@ -268,7 +268,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -295,7 +295,7 @@
       - inject:
           properties-file: version.properties
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: 'versions:set versions:update-child-modules versions:commit'
           properties:
             - 'newVersion=${{release_version}}'
@@ -305,7 +305,7 @@
           global-settings-type: cfp
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
           properties:
             - '{maven-deploy-properties}'
@@ -341,7 +341,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -366,7 +366,7 @@
           settings-file: '{mvn-settings}'
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: '{pom}'
           goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
           properties:
@@ -400,7 +400,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -423,7 +423,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           # yamllint disable rule:line-length
           goals: 'clean deploy'
           # yamllint enable
@@ -434,7 +434,7 @@
 
 #     publishers:
 #       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#           maven-version: '{maven-version}'
 
 - job-template:
     # Job template for Java merge jobs that should also be triggered by upstream
@@ -461,7 +461,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -487,7 +487,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           # yamllint disable rule:line-length
           goals: 'clean deploy'
           # yamllint enable
@@ -498,7 +498,7 @@
 
 #     publishers:
 #       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#           maven-version: '{maven-version}'
 
 - job-template:
     # Job template for Java merge jobs with POM not at the root
@@ -528,7 +528,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -551,7 +551,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: '{pom}'
           # yamllint disable rule:line-length
           goals: 'clean deploy'
@@ -563,7 +563,7 @@
 
 #     publishers:
 #       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#           maven-version: '{maven-version}'
 
 - job-template:
     name: '{project-name}-{stream}-docker-java-daily'
@@ -581,7 +581,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -609,6 +609,7 @@
       - docker-login
 
       - maven-docker-push-daily:
+          maven-version: '{maven-version}'
           mvn-settings: '{mvn-settings}'
           pom: '{docker-pom}'
           # use default as mvn-profile if profile is not needed
@@ -630,7 +631,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -658,7 +659,7 @@
       - docker-login
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -683,7 +684,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -711,7 +712,7 @@
       - docker-login
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: 'pom.xml'
           goals: 'clean install -DskipTests'
           settings: '{mvn-settings}'
@@ -720,7 +721,7 @@
           global-settings-type: cfp
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: '{pom}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
@@ -764,7 +765,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -794,7 +795,7 @@
       - shell: !include-raw-escape: include-update-pom-versions.sh
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
           properties:
             - '{maven-deploy-properties}'
@@ -837,7 +838,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -868,7 +869,7 @@
       - shell: !include-raw-escape: include-update-pom-versions.sh
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           pom: '{pom}'
           goals: 'clean deploy sonar:sonar -Dsonar.host.url=https://sonar.openecomp.org'
           properties:

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 9c3c463..48ef46a 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -31,7 +31,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -65,7 +65,7 @@
 
 #     publishers:
 #       - ecomp-infra-shiplogs:
-#           maven-version: 'mvn33'
+#           maven-version: '{maven-version}'
 
 - job-template:
     name: '{project-name}-{stream}-docker-shell-daily'
@@ -83,7 +83,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -133,7 +133,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:

diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index d8f7d99..9058133 100644 (file)
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -30,7 +30,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -53,7 +53,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -89,7 +89,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -112,7 +112,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -151,7 +151,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -177,7 +177,7 @@
       - inject:
           properties-file: version.properties
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals-versioning}'
           properties:
             - 'newVersion=${{release_version}}'
@@ -187,7 +187,7 @@
           global-settings-type: cfp
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           properties:
             - '{maven-deploy-properties}'
@@ -234,7 +234,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -262,7 +262,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -307,7 +307,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -335,7 +335,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -381,7 +381,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -411,7 +411,7 @@
       - inject:
           properties-file: version.properties
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals-versioning}'
           properties:
             - 'newVersion=${{release_version}}'
@@ -421,7 +421,7 @@
           global-settings-type: cfp
 
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '{mvn-goals}'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -456,7 +456,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -480,7 +480,7 @@
           settings-file: '{mvn-settings}'
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -490,7 +490,7 @@
 
 #    publishers:
 #      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+#          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for 2 scm and script trigger
@@ -524,7 +524,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -553,7 +553,7 @@
           settings-file: '{mvn-settings}'
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -563,7 +563,7 @@
 
 #    publishers:
 #      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+#          maven-version: '{maven-version}'
 
 
 - job-template:
@@ -604,7 +604,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
     scm:
       - gerrit-trigger-scm:
           refspec: '$GERRIT_REFSPEC'
@@ -637,7 +637,7 @@
           settings-file: '{mvn-settings}'
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -647,7 +647,7 @@
 
 #    publishers:
 #      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+#          maven-version: '{maven-version}'
 
 # vim: sw=2 ts=2 sts=2 et :
 
@@ -676,7 +676,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -711,7 +711,7 @@
       - docker-login
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -721,7 +721,7 @@
 
 #    publishers:
 #      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+#          maven-version: '{maven-version}'
 
 - job-template:
     # Job template for scm and script trigger - for docker daily release
@@ -748,7 +748,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
 
     scm:
       - gerrit-trigger-scm:
@@ -782,7 +782,7 @@
       - docker-login
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{maven-version}'
           goals: '--version'
           settings: '{mvn-settings}'
           settings-type: cfp
@@ -792,4 +792,4 @@
 
 #    publishers:
 #      - ecomp-infra-shiplogs:
-#          maven-version: 'mvn33'
+#          maven-version: '{maven-version}'