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

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 193d220e2..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: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630"
-
     #####################
     # Job configuration #
     #####################
@@ -103,6 +96,8 @@
           install-features: "{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "1"
           vm_0_flavor: "{odl_system_flavor}"
@@ -124,8 +119,6 @@
           test-plan: "{project}-{functionality}.txt"
       - integration-jdk-version:
           jdkversion: "{verify-jdkversion}"
-      - distribution-karaf-version:
-          karaf-version: "{verify-karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -184,13 +177,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630"
-
     #####################
     # Job configuration #
     #####################
@@ -211,6 +197,8 @@
           install-features: "{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "1"
           vm_0_flavor: "{odl_system_flavor}"
@@ -236,8 +224,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -265,6 +251,7 @@
       - integration-detect-variables
       - integration-install-common-functions
       - integration-deploy-controller-run-test
+      - integration-run-test
       - integration-cleanup-tmp
 
     publishers:
@@ -450,6 +437,8 @@
           install-features: "{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "1"
           vm_0_flavor: "{odl_system_flavor}"
@@ -475,8 +464,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
 - job-template:
     name: "{prefix}{project}-csit-verify-3node-{functionality}"
@@ -491,13 +478,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630"
-
     #####################
     # Job Configuration #
     #####################
@@ -518,6 +498,8 @@
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
@@ -541,8 +523,6 @@
           test-suites: "{test-suites}"
       - integration-jdk-version:
           jdkversion: "{verify-jdkversion}"
-      - distribution-karaf-version:
-          karaf-version: "{verify-karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -602,13 +582,6 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
-    controller-max-mem: "2048m"
-    tools_system_count: "1"
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630"
-
     #####################
     # Job configuration #
     #####################
@@ -629,6 +602,8 @@
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
@@ -654,8 +629,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -869,6 +842,8 @@
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
@@ -894,8 +869,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
 - job-template:
     name: "{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}"
@@ -910,13 +883,9 @@
     openstack-heat-template: csit-2-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
-    controller-max-mem: "2048m"
     docker_system_count: "1"
-    docker_system_flavor: "odl-standard-1"
-    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200810-015757.604"
+    docker_system_flavor: "v3-standard-2"
+    docker_system_image: "ZZCI - CentOS 7 - docker - x86_64 - 20200901-220018.955"
 
     #####################
     # Job Configuration #
@@ -938,6 +907,8 @@
           install-features: "odl-jolokia,{install-features}"
           use-features-boot: "True"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-2-type:
           vm_0_count: "3"
           vm_0_flavor: "{odl_system_flavor}"
@@ -961,8 +932,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
 
     scm:
       - integration-gerrit-scm:
@@ -1044,20 +1013,6 @@
     openstack-heat-template: csit-4-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
-    controller-max-mem: "2048m"
-    openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836"
-    openstack_system2_count: 0
-    openstack_system2_flavor: "odl-standard-1"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836"
-    tools_system_count: 1
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630"
-
     #####################
     # Job configuration #
     #####################
@@ -1078,6 +1033,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1107,8 +1064,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1305,6 +1260,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1334,8 +1291,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1474,20 +1429,6 @@
     openstack-heat-template: csit-4-instance-type.yaml
     openstack-heat-template-dir: openstack-hot
 
-    odl_system_count: 1
-    odl_system_flavor: "odl-highcpu-4"
-    odl_system_image: "ZZCI - CentOS 7 - builder - x86_64 - 20200811-062543.500"
-    controller-max-mem: "2048m"
-    openstack_system_count: 1
-    openstack_system_flavor: "odl-standard-4"
-    openstack_system_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836"
-    openstack_system2_count: 0
-    openstack_system2_flavor: "odl-standard-1"
-    openstack_system2_image: "ZZCI - CentOS 7 - devstack - x86_64 - 20200811-042231.836"
-    tools_system_count: 1
-    tools_system_flavor: "odl-highcpu-2"
-    tools_system_image: "ZZCI - Ubuntu 16.04 - mininet-ovs-28 - x86_64 - 20200811-063216.630"
-
     #####################
     # Job configuration #
     #####################
@@ -1508,6 +1449,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1537,8 +1480,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1739,6 +1680,8 @@
           install-features: "{install-features}"
           use-features-boot: "{use-features-boot}"
           elasticsearch-attribute: "{elasticsearch-attribute}"
+          karaf-based-controller: "{karaf-based-controller}"
+          karaf-version: "{karaf-version}"
       - integration-stack-4-type:
           vm_0_count: "{odl_system_count}"
           vm_0_flavor: "{odl_system_flavor}"
@@ -1768,8 +1711,6 @@
           branch: "master"
       - integration-jdk-version:
           jdkversion: "{jre}"
-      - distribution-karaf-version:
-          karaf-version: "{karaf-version}"
       - string:
           name: OPENSTACK_BRANCH
           default: "{openstack-branch}"
@@ -1897,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