X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates-java.yaml;h=a0efd78a99c39b7970a83ac4d1c10e8381fe4ce2;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=590c2188f6b680b9feda8ae504479c48fb153a8d;hpb=97f61dca3c17849464c7c3c4e646faa3cafd8012;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 590c2188f..a0efd78a9 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -35,7 +35,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{schedule-saturday}'
 
     builders:
       - provide-maven-settings:
@@ -67,16 +67,6 @@
 - job-template:
     name: '{project-name}-integration-{stream}'
 
-    # Job template for ODL integration verify jobs
-    #
-    # This is similar to a normal verify job, but it runs
-    # when a project that's a dependency of your project
-    # is successfully built.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-
     project-type: freestyle
     node: '{build-node}'
     jdk: '{jdk}'
@@ -135,15 +125,6 @@
 - job-template:
     name: '{project-name}-merge-{stream}'
 
-    # Job template for ODL merge jobs
-    #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-
     # Need to keep jobs that deploy to Nexus at end of build as Maven
     # projects. Maybe reconsider this once upstream moves deploy to a
     # separate lifecycle:
@@ -278,7 +259,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 6'
+      - timed: '{schedule-saturday}'
       - gerrit-trigger-patch-sonar:
           server-name: '{server-name}'
           name: '{project}'
@@ -326,113 +307,9 @@
       - findbugs
       - lf-infra-publish
 
-- job-template:
-    name: '{project-name}-validate-autorelease-{stream}'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - autorelease-release-tag:
-          release-tag: 'validate'
-      - autorelease-release-branch:
-          release-branch: '{branch}'
-      - string:
-          name: CLONE_URL
-          default: '{git-url}/releng/autorelease'
-          description: "Autorelease clone URL"
-
-    scm:
-      - git:
-          url: '$CLONE_URL'
-          credentials-id: 'opendaylight-jenkins-ssh'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - 'origin/{branch}'
-          skip-tag: true
-          submodule:
-            recursive: true
-            timeout: 60
-          choosing-strategy: gerrit
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**/*.xml'
-
-    builders:
-      - jacoco-nojava-workaround
-      - autorelease-checkout-gerrit-patch
-      - autorelease-generate-release-patches
-      # In a perfect world projects should be releasing separately and we consume them
-      # via a project that pulls the release bits from each project from Nexus.
-      # Keep the patches compatible with that ideal, but apply an edit
-      # to enable building in a single maven reactor afterwards.
-      - autorelease-fix-relative-paths
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: validate-pom.xml
-          goals: |
-              clean install dependency:tree
-              -T1.5C
-              -Pq
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - maven-target:
-          maven-version: 'mvn33'
-          pom: 'pom.xml'
-          goals: |
-              clean validate
-              -Pq
-              {opendaylight-infra-mvn-opts}
-          java-opts:
-            - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[autorelease] [{project-name}]'
-      - lf-infra-publish
-
 - job-template:
     name: '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    # 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. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-
     project-type: freestyle
     node: '{build-node}'
     concurrent: true