Minor improvements to release notes job

Tweak the job so that it is more compact and uses only the necessary
declarations.

- Move generate-release-notes job declaration into autorelease projects
  declaration as it uses the same variables as the rest of the jobs.
- Switch to a 4g VM as generating release notes does not require a large
  system.
- Only keep logs for 7 days as opposed to 30 days.
- Choosing strategy should be default as this is not a job that is
  triggered by Gerrit.
- Set timeout to 10 minutes as the job appears to run in less then 5
  minutes.
- Remove unnecessary parameters from Maven call as the mvn command does
  not deploy anything to Nexus.
- Use global-jjb macros.

Change-Id: I71d8b18656cf941e0ce691493011ffb10e289480
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index b077eb419bd0ed0c3db840e415a63105c87a4618..9296e3bbddaace51b2ed8bf2cbaefc6cb9bbcdb4 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -3,6 +3,7 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-release-{stream}'
+      - autorelease-generate-release-notes-{stream}
       - autorelease-version-bump-{stream}
 
     stream:
@@ -34,28 +35,6 @@
         patches.tar.gz
         error.log.gz
 
-
-- project:
-    name: autorelease-release-notes
-    jobs:
-      - 'autorelease-generate-release-notes-{stream}'
-
-    stream:
-      - nitrogen:
-          branch: 'master'
-          jdk: 'openjdk8'
-      - carbon:
-          branch: 'stable/carbon'
-          jdk: 'openjdk8'
-      - boron:
-          branch: 'stable/boron'
-          jdk: 'openjdk8'
-
-    project: 'releng/autorelease'
-    archive-artifacts: >
-        **/*.log
-
-
 ###
 # TODO: Remove this job once guava21 testing is complete
 ###

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 62e0594432a23f40938d7388d65803f23f076e64..a5e63fa9afc17e959d0abf5974fb363515067792 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -213,61 +213,46 @@
     name: 'autorelease-generate-release-notes-{stream}'
 
     project-type: freestyle
-    node: centos7-java-builder-2c-8g
+    node: centos7-java-builder-2c-4g
 
     properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+      - lf-infra-properties:
+          build-days-to-keep: 7
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
 
     scm:
-      - git:
-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - '$GERRIT_BRANCH'
-          choosing-strategy: 'gerrit'
-          skip-tag: true
-          submodule:
-            recursive: true
+      - lf-infra-gerrit-scm:
+          git-url: '$GIT_URL/$GERRIT_PROJECT'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
+          submodule-recursive: true
+          choosing-strategy: default
 
     wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '30'
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: opendaylight-jenkins-ssh
 
     triggers:
       - timed: '0 0 * * 0'
 
     builders:
-      # force jenkins install of maven version before any shell scripts use it
-      - maven-target:
-          maven-version: 'mvn33'
-          goals: '-version'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'odl-global-settings'
-          global-settings-type: cfp
+      - lf-maven-install:
+          maven-version: mvn33
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: mvn33
           pom: '$WORKSPACE/scripts/release_notes_management/pom.xml'
           goals: |
               clean package
-              -Dcheckstyle.skip=true
-              -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
               {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
+          settings: autorelease-settings
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: odl-global-settings
           global-settings-type: cfp
       - autorelease-generate-release-notes