X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fdistribution%2Fdistribution-templates.yaml;h=11f29b5da4ecbb6b5cdbde1719e51e801bff190d;hb=bd725532d0ee35b70923351b6812fdfe872f4655;hp=17712cca77a9157f568a2fdcc11655534c1cf29a;hpb=5d4341b46a6d1875befc576ebc63d385ebd48181;p=releng%2Fbuilder.git

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 17712cca7..11f29b5da 100644
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -24,7 +24,7 @@
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
+          artifacts: '{archive-artifacts}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - distribution-karaf-version:
@@ -79,104 +79,5 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-# Delete these when Karaf 4 becomes Nitrogen default.
-
-# TODO: Is there a way to de-duplicate with generic template parts?
-
-- job-template:
-    name: '{project-name}-distribution3-check-nitrogen'
-    disabled: false
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-    jdk: '{jdk}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts} **/dependency_tree.txt **/target/surefire-reports/*-output.txt'
-      - integration-distribution-git-url:
-          git-url: '{git-url}'
-      - distribution-karaf-version:
-          karaf-version: karaf3
-      - maven-exec:
-          maven-version: mvn33
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: '$GERRIT_PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-      - integration-distribution-scm:
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          # Distro-check jobs typically run within 10 - 30 minutes
-          # with 45 minutes being the occassional edge case.
-          # enforce a 60 minute limit to ensure stuck jobs get
-          # cleared up sooner.
-          # Double that as Karaf 3+4 may take longer.
-          build-timeout: '120'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: 'master'
-          files: '**'
-
-    builders:
-      - distribution-check-wipe
-      - distribution-check-build-project:
-          pom: '$GERRIT_PROJECT/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-verify-groupid:
-          gerrit-project: '$GERRIT_PROJECT'
-      - distribution-check-download-deps:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - distribution-check-delete-snapshots
-      - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
-          dist-pom: 'distribution/pom.xml'
-          mvn-opts: '{opendaylight-infra-mvn-opts}'
-      - integration-upload-distribution:
-          dist-pom: distribution/pom.xml
-      - integration-distribution-check
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project-name}]'
-      - postbuildscript:
-          builders:
-            - shell: |
-                #!/bin/bash
-                mkdir -p $WORKSPACE/archives
-                cp karaf*.log $WORKSPACE/archives
-          script-only-if-succeeded: false
-          script-only-if-failed: false
-          mark-unstable-if-failed: true
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - integration-csit-archive-build
+      - lf-infra-publish