Merge "Fix job to use Be jjb template"

diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml
index 81c677920ae4e5ca928b902d638d24442084f3e0..78eb68b2a45983740554d006f2cec65096dae961 100644 (file)
--- a/jjb/integration/integration-distribution-jobs.yaml
+++ b/jjb/integration/integration-distribution-jobs.yaml
@@ -34,7 +34,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
         - gerrit-parameter:
             branch: '{branch}'
 
@@ -51,8 +51,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - integration-distribution-gerrit-trigger-patch-submitted:
-            name: 'integration'
+        - gerrit-trigger-patch-submitted:
+            name: 'integration/distribution'
             branch: '{branch}'
 
     prebuilders:
@@ -86,7 +86,7 @@
 
     parameters:
         - project-parameter:
-            project: 'integration'
+            project: 'integration/distribution'
 
     scm:
         - gerrit-trigger-scm:
@@ -101,8 +101,8 @@
                 - '{ssh-credentials}'
 
     triggers:
-        - integration-distribution-gerrit-trigger-patch-merged:
-            name: 'integration'
+        - gerrit-trigger-patch-merged:
+            name: 'integration/distribution'
             branch: '{branch}'
 
     prebuilders:

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 41f29bf1dad0fbd5f6a5d1e3ee5e0fe239f7141e..e66647c383d5e520a9317cf3f934631d41471ff5 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -99,62 +99,6 @@
             skip-tag: true
             choosing-strategy: 'gerrit'
 
-- trigger:
-    name: integration-distribution-gerrit-trigger-patch-submitted
-    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'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'pom.xml'
-                  - compare-type: 'ANT'
-                    pattern: 'distributions/**'
-                  - compare-type: 'ANT'
-                    pattern: 'features/**'
-                  - compare-type: 'ANT'
-                    pattern: 'feature-selector/**'
-
-- trigger:
-    name: integration-distribution-gerrit-trigger-patch-merged
-    triggers:
-        - gerrit:
-            server-name: 'OpenDaylight'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{name}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'pom.xml'
-                  - compare-type: 'ANT'
-                    pattern: 'distributions/**'
-                  - compare-type: 'ANT'
-                    pattern: 'features/**'
-                  - compare-type: 'ANT'
-                    pattern: 'feature-selector/**'
-
 - trigger:
     name: integration-test-gerrit-trigger-patch-submitted
     triggers:

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index ae00f1ce9ac9773b27cab622cf4cd7845c2e5822..35383ac61f91797e51b0b7230ba91e743d6f7ee1 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -7,6 +7,10 @@
         - 'builder-weekly'
         - 'builder-check-poms'
 
+        # Maven Sites
+        - 'builder-site-publish'
+        - 'builder-site-verify'
+
     project: 'releng/builder'
 
 - job-template:
@@ -253,3 +257,122 @@
     publishers:
         - email-notification:
             email-prefix: '[releng]'
+
+
+###
+### Maven Sites
+###
+
+- job-template:
+    name: 'builder-site-publish'
+    node: dynamic_merge
+    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:
+        - project-parameter:
+            project: '{project}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            branch: 'master'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - reverse:
+            jobs: 'builder-merge'
+            result: 'success'
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'site:deploy -Dstream=master'
+        maven-opts: '-Xmx1024m'
+        settings: '{autorelease-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[releng]'
+
+- job-template:
+    name: 'builder-site-verify'
+    node: dynamic_verify
+    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:
+        - project-parameter:
+            project: '{project}'
+        - gerrit-parameter:
+            branch: 'master'
+
+    scm:
+        - gerrit-trigger-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    wrappers:
+        - ssh-agent-credentials:
+            users:
+                - '{ssh-credentials}'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'releng/builder'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/master'
+                file-paths:
+                    - compare-type: ANT
+                      pattern: src/**
+                    - compare-type: ANT
+                      pattern: pom.xml
+
+    maven:
+        maven-name: '{mvn33}'
+        root-pom: 'pom.xml'
+        goals: 'site:site -Dstream=master'
+        maven-opts: '-Xmx1024m'
+        settings: '{autorelease-settings}'
+        global-settings: '{odl-global-settings}'
+
+    publishers:
+        - email-notification:
+            email-prefix: '[releng]'

diff --git a/src/site/markdown/jenkins.md b/src/site/markdown/jenkins.md
index 17e167b702fd117a57987f6d6a9af5b37353600f..fe9c425d5d9c5e37e29480d2c794e4600a93a0b1 100644 (file)
--- a/src/site/markdown/jenkins.md
+++ b/src/site/markdown/jenkins.md
@@ -561,7 +561,7 @@ builder repo, and assume the "jenkins.ini" file is located there.
     jenkins-jobs --conf jenkins.ini test jjb/ <job-name>
     jenkins-jobs --conf jenkins.ini test jjb/ openflowplugin-csit-periodic-1node-cds-longevity-only-master
 
-Expect to see an XML file describing the build job in </maven2-moduleset> tags
+Expect to see an XML file describing the build job in \</maven2-moduleset\> tags
 on STOUT. If you dont see any XML check that you have assigned values to the
 parameters between {} in the YAML files. For example {project}