Do not enable openjdk8 for controller stable/helium branch

[releng/builder.git] / jjb / controller / controller.yaml

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index bc3b0a9811eeba767ae73e1daa644f3596a3bfc3..a94558b213e14496b4ea831fff48bf45e41eb438 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -6,7 +6,6 @@
 - project:
     name: controller
     jobs:
-        - 'controller-verify-{stream}'
         - 'controller-merge-{stream}'
         - 'controller-daily-{stream}'
         - 'controller-integration-{stream}'
@@ -32,81 +31,6 @@
 # MAVEN_GOALS with your maven goals to build
 # MAVEN_OPTS with your maven options to build
 
-- job-template:
-    name: 'controller-verify-{stream}'
-
-    # Job template for ODL verify jobs
-    #
-    # The purpose of this job template is to setup a ODL verify job
-    #
-    # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
-
-    project-type: matrix
-    node: matrix_master
-    concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - dynamic_verify
-        - axis:
-            type: jdk
-            values:
-                - openjdk7
-                - 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}'
-        - gerrit-parameter:
-            branch: '{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - build-timeout
-        - ssh-agent-credentials:
-            users:
-                - '{ssh-credentials}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'controller'
-            branch: '{branch}'
-
-    builders:
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: '{mvn32}'
-            pom: 'pom.xml'
-            goals: '-Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r clean install -Pintegrationtests,docs'
-            java-opts:
-                - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-            settings: '{controller-settings}'
-            global-settings: '{odl-global-settings}'
-        - jacoco-nojava-workaround
-
-    publishers:
-        - findbugs
-        - email-notification:
-            email-prefix: '[controller]'
-        - jacoco-report
-
 - job-template:
     name: 'controller-merge-{stream}'