X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=cb434a3b0760128cfafb9a0396a2995f271f6227;hb=fbb6852790ef13e01d614200cf9c9ac821105ef5;hp=a17b29adc5cb40ab436b00d27218239081d53ae9;hpb=49efb6213e9c677f9ef74be0fcf41443757d13cb;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index a17b29adc..cb434a3b0 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -37,6 +37,7 @@
           branch: master
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -53,7 +54,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: 'autorelease-release-{stream}'
+    name: 'autorelease-release-{stream}-{mvn-version}-{java-version}'
 
     ######################
     # Default parameters #
@@ -61,11 +62,15 @@
 
     build-node: '{build-node}'
     cron: 'H 0 * * *'
-    java-version: openjdk8
+    java-version: '{java-version}'
     mvn-global-settings: global-settings
+    mvn-goals: clean deploy
+    mvn-opts: '-Xmx8g -Dmaven.compile.fork=true'
+    mvn-params: ''
     mvn-settings: autorelease-settings
     mvn-version: mvn35
-    extra-mvn-opts: ''
+    sign-artifacts: true
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
@@ -73,35 +78,26 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
           build-days-to-keep: 30
 
     parameters:
-      - maven-exec:
-          maven-version: '{mvn-version}'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
           branch: '{branch}'
           lftools-version: '{lftools-version}'
+      - lf-infra-maven-parameters:
+          mvn-opts: '{mvn-opts}'
+          mvn-params: '{mvn-params}'
+          mvn-version: '{mvn-version}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{stream}'
-      - string:
-          name: EXTRA_MVN_OPTS
-          default: '{extra-mvn-opts}'
-          description: |
-              Additional optional Maven Options to pass to the Maven Goals
-              parameter.
-
-              Examples:
-              -Dskip.karaf.featureTest=true  # To disable karaf SingleFeatureTests
-              --fail-never   # NEVER fail the build, regardless of project result
-              --fail-at-end  # Only fail the build afterwards; allow all non-impacted builds to continue
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -143,10 +139,10 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - lf-infra-create-netrc:
-          server-id: '{mvn-staging-id}'
       - autorelease-generate-release-patches
       - autorelease-generate-artifact-versions
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
@@ -155,23 +151,16 @@
       # Keep the patches compatible with that ideal, but apply an edit
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
-      - maven-target:
-          maven-version: '{mvn-version}'
-          pom: 'pom.xml'
-          goals: |
-              clean deploy
-              $EXTRA_MVN_OPTS
-              -Pintegrationtests,repoBuild
-              -Dcheckstyle.skip=true
-              -DaltDeploymentRepository=staging::default::file:"$WORKSPACE"/m2repo
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: '{mvn-global-settings}'
-          global-settings-type: cfp
-      - lf-maven-stage
+      - lf-maven-build:
+          mvn-goals: '{mvn-goals}'
+      - lf-sigul-sign-dir:
+          sign-artifacts: '{sign-artifacts}'
+          sign-dir: '$WORKSPACE/m2repo'
+          sign-mode: serial
+      - lf-maven-stage:
+          mvn-global-settings: '{mvn-global-settings}'
+          mvn-settings: '{mvn-settings}'
+          mvn-staging-id: '{mvn-staging-id}'
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
@@ -221,6 +210,7 @@
     ######################
 
     cron: 'H 0 * * *'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -228,6 +218,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-2g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -247,6 +238,7 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -285,6 +277,7 @@
     ######################
 
     cron: '@weekly'
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -292,6 +285,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-1g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -310,6 +304,7 @@
           branch: master
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -363,6 +358,7 @@
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
+    disable-job: 'false'
 
     #####################
     # Job configuration #
@@ -370,6 +366,7 @@
 
     project-type: freestyle
     node: '{build-node}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
@@ -411,6 +408,7 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -440,6 +438,7 @@
     ######################
     # Default parameters #
     ######################
+    disable-job: 'false'
 
     gerrit_merge_triggers:
       - comment-added-contains-event:
@@ -451,6 +450,7 @@
 
     project-type: freestyle
     node: centos7-builder-2c-8g
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -466,13 +466,14 @@
           name: RELEASE
           description: |
               Release to generate release notes for.
-              Eg. Oxygen-SR1, Fluorine-SR2...
+              Eg. Neon-SR1, Fluorine-SR2...
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           branch: '$GERRIT_BRANCH'
           refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-disable: false
           submodule-recursive: true
           submodule-timeout: 10
           choosing-strategy: default
@@ -511,18 +512,19 @@
     mvn-global-settings: global-settings
     mvn-settings: autorelease-settings
     mvn-version: mvn35
+    disable-job: 'false'
 
     #####################
     # Job Configuration #
     #####################
 
-    disabled: false
     project-type: freestyle
     # Note: This NEEDS to be hardcoded as projects should NOT be allowed to
     #       override the build node.
     node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - lf-infra-properties:
@@ -600,7 +602,7 @@
               -Pq
               {opendaylight-infra-mvn-opts}
           java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+            - '-Xmx8g -Dmaven.compile.fork=true'
           settings: '{mvn-settings}'
           settings-type: cfp
           global-settings: '{mvn-global-settings}'