Generate versions.csv for autorelease builds

[releng/builder.git] / jjb / autorelease / autorelease-templates.yaml

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index aea8a08ff187cfe4448816bd9f697f11ec847c8e..0dd622129420065c80f73dea0a25f4d648bbcbda 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -19,18 +19,14 @@
     parameters:
       - maven-exec:
           maven-version: 'mvn33'
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - autorelease-release-tag:
           release-tag: '{next-release-tag}'
-      - autorelease-release-branch:
-          release-branch: '{branch}'
       - string:
           name: EXTRA_MVN_OPTS
           default: '{extra-mvn-opts}'
@@ -42,6 +38,10 @@
               -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}'
+          description: Artifacts to archive to the logs server.
 
     scm:
       - git:
@@ -74,11 +74,11 @@
       - autorelease-cfp:
           autorelease-settings: 'autorelease-settings'
           global-settings: 'odl-global-settings'
-      - autorelease-generate-taglist
+      - autorelease-generate-release-patches
+      - autorelease-generate-artifact-versions
       - autorelease-distribute-taglist
       - distribute-build-url:
           path: 'integration/distribution/$KARAF_ARTIFACT/src/main/assembly'
-      - 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.
       # Keep the patches compatible with that ideal, but apply an edit
@@ -321,21 +321,19 @@
     project-type: freestyle
     node: '{build-node}'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: openjdk8
 
     properties:
-      - opendaylight-infra-properties:
+      - lf-infra-properties:
           build-days-to-keep: 7
 
     parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
+      - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
       - autorelease-release-tag:
-          release-tag: 'validate'
+          release-tag: validate
       - string:
           name: CLONE_URL
           default: '{git-url}/releng/autorelease'
@@ -374,7 +372,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: mvn33
           pom: validate-pom.xml
           goals: |
               clean install dependency:tree
@@ -383,22 +381,22 @@
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g'
-          settings: 'autorelease-settings'
+          settings: autorelease-settings
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: 'mvn33'
-          pom: 'pom.xml'
+          maven-version: mvn33
+          pom: pom.xml
           goals: |
               clean validate
               -Pq
               {opendaylight-infra-mvn-opts}
           java-opts:
             - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
+          settings: autorelease-settings
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: global-settings
           global-settings-type: cfp
 
     publishers: