X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-templates.yaml;h=81e19b4a9188698fd3830f444c790129545c4deb;hb=6b04c66cafedc5cfc85d46978f13d7c150bc6869;hp=97156d9e490851de685076dd0b467498677a2fdb;hpb=533e580ed7688d39346882922b3db5cb9fa04d2e;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 97156d9e4..81e19b4a9 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -76,13 +76,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -184,13 +177,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -492,13 +478,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job Configuration #
     #####################
@@ -603,13 +582,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -911,10 +883,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_count: 1
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
     docker_system_count: "1"
     docker_system_flavor: "v3-standard-2"
     docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955"
@@ -1045,20 +1013,6 @@
     openstack-heat-template: csit-4-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_count: 1
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    openstack_system_count: 1
-    openstack_system_flavor: "v3-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    openstack_system2_count: 0
-    openstack_system2_flavor: "v3-standard-2"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    tools_system_count: 1
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -1475,20 +1429,6 @@
     openstack-heat-template: csit-4-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_count: 1
-    odl_system_flavor: "v3-standard-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200901-060217.896"
-    controller-max-mem: "2048m"
-    openstack_system_count: 1
-    openstack_system_flavor: "v3-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    openstack_system2_count: 0
-    openstack_system2_flavor: "v3-standard-2"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200813-052044.669"
-    tools_system_count: 1
-    tools_system_flavor: "v3-standard-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200813-051640.743"
-
     #####################
     # Job configuration #
     #####################
@@ -1898,6 +1838,106 @@
             Install a custom OVS. It can be an OVS version to build (like
             v2.9.2 or v2.6.1-nsh) or a yum repo url to pull from.
 
+# Template: {project}-mri-patch-test-{stream}
+# Goal: Build a patch and run project specific system test on a mri projects distribution containing the change
+# Operation: This job template builds a patch, uses the projects distribution and triggers the project system
+# test defined in {csit-list} when gerrit receives test-{project} keyword
+
+- job-template:
+    name: "{prefix}{project}-mri-patch-test-{feature}-{stream}"
+    id: inttest-mri-patch-test
+    <<: *inttest_csit_common
+
+    build-timeout: 720
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: "{os-cloud}"
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - integration-distribution-branch:
+          branch: "{branch}"
+      - distribution-karaf-version:
+          karaf-version: "{karaf-version}"
+      - integration-distribution-git-url:
+          git-url: "{git-url}"
+      - string:
+          name: feature
+          default: "all"
+          description: "Specific feature test for patch"
+      - maven-exec:
+          maven-version: mvn35
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: "{project}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "{branch}"
+      - integration-distribution-scm:
+          branch: "{branch}"
+
+    triggers:
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: "test-{project}-all"
+            - comment-added-contains-event:
+                comment-contains-value: "test-{project}-{feature}"
+          projects:
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+
+    builders:
+      - integration-rebase-gerrit-patch
+      - wipe-org-opendaylight-repo
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - maven-target:
+          maven-version: mvn35
+          pom: "{project}/pom.xml"
+          goals: |
+            clean install dependency:tree
+            -Pq
+            -Dgitid.skip=false
+            -Dmaven.gitcommitid.skip=false
+            -DgenerateReports=false
+            -Dstream={stream}
+            {opendaylight-infra-mvn-opts}
+          # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
+          java-opts:
+            - "-Xmx4096m -Dmaven.compile.fork=true"
+          settings: integration-settings
+          settings-type: cfp
+          global-settings: global-settings
+          global-settings-type: cfp
+      - integration-upload-distribution:
+          dist-pom: "{project}/pom.xml"
+      - trigger-builds:
+          - project: "{csit-list}"
+            block: true
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              GERRIT_BRANCH=$GERRIT_BRANCH
+              GERRIT_PROJECT=$GERRIT_PROJECT
+              GERRIT_REFSPEC=$GERRIT_REFSPEC
+              KARAF_VERSION=$KARAF_VERSION
+
+    publishers:
+      - email-notification:
+          email-recipients: "{email-recipients}"
+          email-prefix: "[{project}]"
+
 # Template: {project}-patch-test-{stream}
 # Goal: Build a patch and run project specific system test on a distribution containing the change
 # Operation: This job template builds a patch, creates a distribution containing the patch, and