Move daily builds into release builds

- Remove daily job type
- Make release builds run daily

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

diff --git a/jjb/autorelease/autorelease-beryllium.yaml b/jjb/autorelease/autorelease-beryllium.yaml
deleted file mode 100644 (file)
index 057ce9f..0000000
--- a/jjb/autorelease/autorelease-beryllium.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-# Beryllium build jobs
-
-- project:
-    name: autorelease-beryllium
-    jobs:
-        - 'autorelease-daily-beryllium-jdk8'
-
-    branch: 'master'
-    project: 'releng/autorelease'
-    jdk: 'openjdk8'
-
-- job-template:
-    name: 'autorelease-daily-beryllium-jdk8'
-
-    project-type: maven
-    node: dynamic_autorelease
-    jdk: 'openjdk8'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - autorelease-release-tag:
-            release-tag: 'Daily'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
-
-    scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-
-    wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H 0 * * *'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{autorelease-settings}'
-        - autorelease-generate-taglist
-        - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - shell: "./scripts/list-project-dependencies.sh"
-        - autorelease-maven-sources:
-            maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - autorelease-maven-sources-post-process
-        - autorelease-sys-stats
-
-    publishers:
-        - archive-artifacts:
-            artifacts: '*.log,patches/*.patch'
-        - email-notification:
-            email-prefix: '[autorelease]'

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 41c9d951d1c80dce4da348387aa29ceea6452eee..db908131b2b050401a9d2e91adede2b5750a0df8 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -1,7 +1,6 @@
 - project:
     name: autorelease-projects
     jobs:
-        - 'autorelease-daily-{stream}'
         - 'autorelease-release-{stream}'
         - 'autorelease-project-report-{stream}'
         - 'autorelease-site-publish-{stream}'
@@ -10,7 +9,7 @@
     stream:
     - beryllium:
         branch: 'master'
-        jdk: 'openjdk7'
+        jdk: 'openjdk8'
         integration-test: beryllium
     - lithium:
         branch: 'stable/lithium'

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index e5c30d28aa04239c5efcba6539fc586746c9d7e7..f19bd95a1fcede1d17abb7f5fdb0dca403cb2890 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -1,83 +1,5 @@
 # Autorelease build jobs
 
-- job-template:
-    name: 'autorelease-daily-{stream}'
-
-    project-type: maven
-    node: dynamic_autorelease
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - autorelease-release-tag:
-            release-tag: 'Daily'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - autorelease-release-datestamp:
-            datestamp: true
-
-    scm:
-        - git:
-            credentials-id: '{ssh-credentials}'
-            url: '$GIT_BASE'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-
-    wrappers:
-        - autorelease-build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H 0 * * *'
-
-    prebuilders:
-        - wipe-org-opendaylight-repo
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{autorelease-settings}'
-        - autorelease-generate-taglist
-        - autorelease-generate-release-patches
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Pintegrationtests,docs,repoBuild -Djenkins -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: '{autorelease-settings}'
-        global-settings: '{odl-global-settings}'
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - shell: "./scripts/list-project-dependencies.sh"
-        - autorelease-maven-sources:
-            maven-version: '{mvn33}'
-            settings: '{autorelease-settings}'
-            global-settings: '{odl-global-settings}'
-        - autorelease-maven-sources-post-process
-        - autorelease-sys-stats
-
-    publishers:
-        - archive-artifacts:
-            artifacts: '*.log,patches/*.patch'
-        - email-notification:
-            email-prefix: '[autorelease]'
-
-
 - job-template:
     name: 'autorelease-release-{stream}'
 
@@ -118,6 +40,9 @@
             users:
                 - '{ssh-credentials}'
 
+    triggers:
+        - timed: 'H 0 * * *'
+
     prebuilders:
         - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround