Pyangbind version updated.

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

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index 8485cb07efdcff86d7937d996cb3da6e92cd2607..e15c52799789520622bb93cedf8b55ffbd66e57f 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -3,7 +3,7 @@
 - job-template:
     name: 'autorelease-release-{stream}'
 
-    project-type: maven
+    project-type: freestyle
     node: centos7-autorelease-4c-16g
     jdk: '{jdk}'
 
@@ -41,31 +41,27 @@
     triggers:
         - timed: 'H 0 * * *'
 
-    prebuilders:
+    builders:
         - wipe-local-maven-repo
         - jacoco-nojava-workaround
+        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-cfp:
             autorelease-settings: 'autorelease-settings'
             odl-global-settings: 'odl-global-settings'
         - autorelease-generate-taglist
         - autorelease-distribute-taglist
         - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
-        maven-opts: '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: 'autorelease-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        automatic-archiving: true
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
+        - maven-target:
+              maven-version: '{mvn33}'
+              pom: 'pom.xml'
+              goals: 'clean deploy -V -B -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage'
+              java-opts:
+                - '-Xmx10g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+              settings: 'autorelease-settings'
+              settings-type: cfp
+              global-settings: 'odl-global-settings'
+              global-settings-type: cfp
         - autorelease-maven-deploy
-        - shell: "./scripts/list-project-dependencies.sh"
         - autorelease-get-integration-test-variables
         - autorelease-maven-sources:
             maven-version: '{mvn33}'
@@ -73,10 +69,11 @@
             global-settings: 'odl-global-settings'
         - autorelease-maven-sources-post-process
         - autorelease-sys-stats
+        - shell: |
+            mkdir -p archives/
+            cp *.log *.prop $_
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.prop,*.log,patches/*.bundle,patches/*.patch,patches/*.log'
     - email-notification:
         email-prefix: '[autorelease]'
     - trigger-parameterized-builds:
@@ -84,6 +81,8 @@
           condition: UNSTABLE_OR_BETTER
           property-file: variables.prop
           fail-on-missing: true
+    - opendaylight-infra-shiplogs:
+        maven-version: '{mvn33}'
 
 - job-template:
     name: 'autorelease-project-report-{stream}'
@@ -135,8 +134,6 @@
         - autorelease-sys-stats
 
     publishers:
-    - archive-artifacts:
-        artifacts: '*.log,project-reports/*.log'
     - email-ext:
         attachments: 'project-reports/*.log'
         recipients: 'skitt@redhat.com thanh.ha@linuxfoundation.org'
@@ -150,109 +147,5 @@
 
             Archive also available on Jenkins at $BUILD_URL
         always: true
-
-###
-### Maven Sites
-###
-
-- job-template:
-    name: 'autorelease-site-publish-{stream}'
-    node: centos7-java-builder-2c-8g
-    concurrent: false
-    jdk: 'openjdk8'
-
-    # This job's purpose is to publish maven site
-
-    project-type: maven
-
-    logrotate:
-        daysToKeep: 7
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-
-    scm:
-    - gerrit-trigger-scm:
-        refspec: ''
-        choosing-strategy: 'default'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-    - autorelease-trigger-patch-site-merged:
-        name: '{project}'
-        branch: '{branch}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'site.xml'
-        goals: 'site:site site:deploy -Dstream={stream}'
-        maven-opts: '-Xmx1024m'
-        settings: 'autorelease-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    publishers:
-    - email-notification:
-        email-prefix: '[releng]'
-
-- job-template:
-    name: 'autorelease-site-verify-{stream}'
-    node: centos7-java-builder-2c-8g
-    concurrent: true
-    jdk: 'openjdk8'
-
-    # This job's purpose is to verify maven site configuration
-
-    project-type: maven
-
-    logrotate:
-        daysToKeep: 7
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
-    parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
-
-    scm:
-    - gerrit-trigger-scm:
-        refspec: '$GERRIT_REFSPEC'
-        choosing-strategy: 'gerrit'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-    - autorelease-trigger-patch-site-submitted:
-        name: '{project}'
-        branch: '{branch}'
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'site.xml'
-        goals: 'site:site -Dstream={stream}'
-        maven-opts: '-Xmx1024m'
-        settings: 'autorelease-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-
-    publishers:
-        - email-notification:
-            email-prefix: '[releng]'
+    - opendaylight-infra-shiplogs:
+        maven-version: '{mvn33}'