X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fautorelease%2Fautorelease-templates.yaml;h=0b4d4201ffc42e2ca7038eacfb975f73ffb78c87;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=dcea3236663fd23f1e64658ee47da86aaecf2712;hpb=abf22fa7a8adb66650bbc6322e7b5c84eb81d428;p=releng%2Fbuilder.git

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index dcea32366..0b4d4201f 100644
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -3,15 +3,23 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    project-type: freestyle
-    node: centos7-autorelease-4c-16g
-    jdk: '{jdk}'
-    cron: 'H 0 * * *'
+    ############
+    # Defaults #
+    ############
 
-    # Default variable values
+    java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
 
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: centos7-autorelease-4c-16g
+    jdk: '{java-version}'
+    cron: 'H 0 * * *'
+
     properties:
       - lf-infra-properties:
           build-days-to-keep: 30
@@ -260,15 +268,23 @@
           - version-bump.sh
 
     publishers:
-      - trigger-parameterized-builds:
-          - project: 'autorelease-generate-release-notes-{stream}'
-            condition: UNSTABLE_OR_BETTER
-            trigger-with-no-params: true
       - lf-infra-publish
 
 - job-template:
     name: 'autorelease-generate-release-notes-{stream}'
 
+    ######################
+    # Default parameters #
+    ######################
+
+    gerrit_merge_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: generate-release-notes .+$
+
+    #####################
+    # Job Configuration #
+    #####################
+
     project-type: freestyle
     node: centos7-java-builder-2c-4g
 
@@ -282,12 +298,15 @@
           branch: '{branch}'
           stream: '{stream}'
           lftools-version: '{lftools-version}'
+      - string:
+          name: RELEASE
+          description: Release to generate release notes for.
 
     scm:
       - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
+          branch: '$GERRIT_BRANCH'
+          refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
           choosing-strategy: default
@@ -298,21 +317,17 @@
           jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     triggers:
-      - timed: '0 0 * * 0'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on: '{obj:gerrit_merge_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
 
     builders:
-      - lf-maven-install:
-          mvn-version: mvn33
-      - maven-target:
-          maven-version: mvn33
-          pom: '$WORKSPACE/scripts/release_notes_management/pom.xml'
-          goals: |
-              clean package
-              {opendaylight-infra-mvn-opts}
-          settings: autorelease-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
       - autorelease-generate-release-notes
 
     publishers:
@@ -320,12 +335,22 @@
 
 - job-template:
     name: '{project-name}-validate-autorelease-{stream}'
-    disabled: false
 
+    ############
+    # Defaults #
+    ############
+
+    java-version: openjdk8
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    disabled: false
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
-    jdk: openjdk8
+    jdk: '{java-version}'
 
     properties:
       - lf-infra-properties:
@@ -370,6 +395,8 @@
     builders:
       - autorelease-checkout-gerrit-patch
       - jacoco-nojava-workaround
+      - shell: "./scripts/list-project-dependencies.sh"
+      - autorelease-determine-merge-order
       - autorelease-generate-release-patches
       # In a perfect world projects should be releasing separately and we consume them
       # via a project that pulls the release bits from each project from Nexus.
@@ -403,6 +430,9 @@
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
+      - shell: |
+          mkdir -p archives/
+          cp *.log $_
 
     publishers:
       - email-notification: