Remove the {project}-verify-{stream} job type

All projects have now been migrated to using the
{project}-verify-{stream}-{maven}-{jdks} job type so remove this
obsolete job type.

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

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index d4b7eff6932909fd07251e0c97a9e34df6807df6..b020de9247dacb75cb02c0f27e8598ab07ef8857 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -676,18 +676,6 @@ overrided via the opendaylight-infra-wrappers' build-timeout property.
         </td>
       </tr>
 
-      <tr class="warning">
-        <td><b>Job Template</b><br/>{project}-verify-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>
-      </tr>
-      <tr>
-        <td colspan="2">
-            <b>(deprecated)</b>
-            The Verify job template creates a Gerrit Trigger job that will
-            trigger when a new patch is submitted to Gerrit.
-        </td>
-      </tr>
-
       <tr class="warning">
         <td><b>Job Template</b><br/>{project}-verify-{stream}-{maven}-{jdks}</td>
         <td><b>Gerrit Trigger</b><br/>recheck | reverify</td>

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ed5803b20c986ed3cd4c6220c189d94e5954bb24..f760631f3e968e6d20429497814066ef8129512b 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -643,78 +643,6 @@
         - archive-build:
             maven-version: '{mvn33}'
 
-- job-template:
-    name: '{project-name}-verify-{stream}'
-
-    # Job template for ODL verify jobs
-    #
-    # The purpose of this job template is to setup a ODL verify job
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: matrix
-    node: matrix_master
-    concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - '{build-node}'
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
-
-    logrotate:
-        daysToKeep: '14'
-
-    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:
-        - gerrit-trigger-patch-submitted:
-            name: '{project}'
-            branch: '{branch}'
-
-    builders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: '{mvn-settings}'
-        - maven-target:
-            maven-version: '{mvn33}'
-            goals: '{mvn-goals} -V -B -Djenkins -Dstream={stream}'
-            java-opts:
-                - '{mvn-opts}'
-            settings: '{mvn-settings}'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-
-    publishers:
-        - findbugs
-        - email-notification:
-            email-prefix: '[{project-name}]'
-        - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
-
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'