Merge "Switch mininet to v2-highcpu-2 flavor"

[releng/builder.git] / jjb / integration / distribution / distribution-templates.yaml

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 11aeb60b41a4bd8d3d7eb9de856e9373ea622443..d9fcca0f145eb03fc828b8bb7e7c20c8ab0d59b7 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -10,7 +10,7 @@
     disabled: false
 
     project-type: freestyle
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     concurrent: true
     jdk: '{jdk}'
 
@@ -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:
@@ -51,7 +51,7 @@
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
+          gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
           branch: '{branch}'
           files: '**'
@@ -61,31 +61,33 @@
       - distribution-check-build-project:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           gerrit-project: '$GERRIT_PROJECT'
       - distribution-check-download-deps:
           dist-pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
-      - distribution-check-repeat-build:
+      - distribution-check-repeat-project-build:
+          pom: '$GERRIT_PROJECT/pom.xml'
+          mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+      - distribution-check-repeat-distro-build:
           dist-pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+      - integration-set-variables
+      - distribution-check-warn-9191
+      - distribution-check-warn-9192
       - integration-upload-distribution:
           dist-pom: distribution/pom.xml
-      - integration-distribution-check
+      - distribution-check-bootup
 
     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
+      - integration-csit-archive-build
       - lf-infra-publish