Convert validate-autorelease to be regular jjb template

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

diff --git a/jjb-templates/project.yaml b/jjb-templates/project.yaml
index 392814590b46098725ebffa2485b965b5c69abba..d9d58da425ddbe4f0ba91b767b8f9128f9885b12 100644 (file)
--- a/jjb-templates/project.yaml
+++ b/jjb-templates/project.yaml
@@ -9,6 +9,7 @@
         - '{name}-clm-{stream}'
         - '{name}-distribution-{stream}'
         - '{name}-distribution-check-{stream}'
+        - '{name}-validate-autorelease-{stream}'
 JOB_TEMPLATES
 
     # stream:    release stream (eg. stable-lithium or beryllium)

diff --git a/jjb-templates/validate-autorelease.yaml b/jjb-templates/validate-autorelease.yaml
deleted file mode 100644 (file)
index fcb819c..0000000
--- a/jjb-templates/validate-autorelease.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-- job-template:
-    name: 'PROJECT_SHORTNAME-validate-autorelease-{stream}'
-    disabled: '{obj:disable_autorelease}'
-
-    project-type: maven
-    node: dynamic_verify
-    concurrent: true
-    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}'
-        - gerrit-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-        - autorelease-release-tag:
-            release-tag: 'validate'
-        - autorelease-release-branch:
-            release-branch: '{branch}'
-        - string:
-            name: CLONE_URL
-            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
-            description: "Autorelease clone URL"
-
-    scm:
-        - git:
-            url: '$CLONE_URL'
-            credentials-id: 'opendaylight-jenkins-ssh'
-            refspec: ''
-            branches:
-                - 'origin/{branch}'
-            skip-tag: true
-            submodule:
-                recursive: true
-                timeout: 60
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'true'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'true'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-                - comment-added-contains-event:
-                    comment-contains-value: 'revalidate'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'PROJECT_PATH'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: '**/*.xml'
-
-    prebuilders:
-        - jacoco-nojava-workaround
-        - autorelease-checkout-gerrit-patch
-        - autorelease-generate-release-patches
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: validate-pom.xml
-            goals: 'clean install -V -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-            java-opts:
-            - '-Xmx8g'
-            settings: 'autorelease-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean validate -V -B -Djenkins -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'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
-        - autorelease-sys-stats
-
-    publishers:
-        - email-notification:
-            email-prefix: '[autorelease] [PROJECT_SHORTNAME]'
-        - archive-build:
-            maven-version: '{mvn33}'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 6f9eed499022d96e2dd93ec6e4e060128d6db7b4..f489f306f2913dadc276ca09965934a28e83ab90 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -227,3 +227,111 @@
             mark-unstable-if-failed: True
         - archive-build:
             maven-version: '{mvn33}'
+
+- job-template:
+    name: '{name}-validate-autorelease-{stream}'
+    disabled: '{obj:disable_autorelease}'
+
+    project-type: maven
+    node: dynamic_verify
+    concurrent: true
+    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}'
+        - gerrit-parameters:
+            project: '{project}'
+            branch: '{branch}'
+            refspec: 'refs/heads/{branch}'
+        - autorelease-release-tag:
+            release-tag: 'validate'
+        - autorelease-release-branch:
+            release-branch: '{branch}'
+        - string:
+            name: CLONE_URL
+            default: 'ssh://jenkins-$SILO@git.opendaylight.org:29418/releng/autorelease'
+            description: "Autorelease clone URL"
+
+    scm:
+        - git:
+            url: '$CLONE_URL'
+            credentials-id: 'opendaylight-jenkins-ssh'
+            refspec: ''
+            branches:
+                - 'origin/{branch}'
+            skip-tag: true
+            submodule:
+                recursive: true
+                timeout: 60
+
+    wrappers:
+        - opendaylight-infra-wrappers:
+            build-timeout: '{build-timeout}'
+
+    triggers:
+        - gerrit:
+            server-name: 'OpenDaylight'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'true'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'true'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+                - comment-added-contains-event:
+                    comment-contains-value: 'revalidate'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'PROJECT_PATH'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: '**/*.xml'
+
+    prebuilders:
+        - jacoco-nojava-workaround
+        - autorelease-checkout-gerrit-patch
+        - autorelease-generate-release-patches
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: validate-pom.xml
+            goals: 'clean install -V -B -T1.5C -Djenkins -DskipTests -Dcheckstyle.skip=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+            - '-Xmx8g'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'clean validate -V -B -Djenkins -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'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
+        automatic-archiving: false
+        post-step-run-condition: UNSTABLE
+
+    postbuilders:
+        - autorelease-sys-stats
+
+    publishers:
+        - email-notification:
+            email-prefix: '[autorelease] [{name}]'
+        - archive-build:
+            maven-version: '{mvn33}'

diff --git a/scripts/jjb-init-project.py b/scripts/jjb-init-project.py
index 7f6f8d2e93f302d8846d6f9b8df02c8256f2a781..6391a253db39797450e46a2c9695a947ebe42b08 100644 (file)
--- a/scripts/jjb-init-project.py
+++ b/scripts/jjb-init-project.py
@@ -60,7 +60,6 @@ else:
     templates = (
         "verify,merge,periodic,integration,"
         "sonar")
-templates += ",validate-autorelease"  # Autorelease validate template
 
 ##################
 # Handle Streams #