Merge "Update cloud image list docs"

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 6ad59e788935569e26e7c4f80b6dc5f9e17f7988..2819e2cb183b16ad95bcc9359763873562d837c7 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -2,6 +2,8 @@
 - project:
     name: controller-master
     jobs:
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: controller
@@ -18,8 +20,7 @@
     mvn-settings: 'controller-settings'
     mvn-version: mvn36
     mvn-goals: 'clean deploy -Pdocs'
-    mvn-opts: '-Xmx4096m -Dmaven.compile.fork=true'
-    build-node: centos7-builder-8c-8g
+    mvn-opts: '-Xmx3072m -Dmaven.compile.fork=true'
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'

diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 43cdb93cf0d27ad074735acda527cbd138d83a15..2edafdf1bd99f4ae9cb456e6b9dd88de2d1a2d74 100644 (file)
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -187,6 +187,12 @@
     10-exclude-value: ''
 
     # Manual CSIT job lists used by sanity or periodic in nature.
+    csit-mri-list-aluminium: >
+        yangtools-csit-1node-system-only-aluminium
+    csit-mri-list-magnesium: >
+        yangtools-csit-1node-system-only-magnesium
+    csit-mri-list-sodium: >
+        yangtools-csit-1node-system-only-sodium
     csit-sanity-list-aluminium: >
         openflowplugin-csit-1node-sanity-only-aluminium,
         distribution-sanity-aluminium

diff --git a/jjb/integration/csit-jobs-aluminium.lst b/jjb/integration/csit-jobs-aluminium.lst
index 18cd3c1122fd58dfcbb65b77c466966745989398..6c70d5d79ee62c04b674e544a04db9986ed267c6 100644 (file)
--- a/jjb/integration/csit-jobs-aluminium.lst
+++ b/jjb/integration/csit-jobs-aluminium.lst
@@ -23,7 +23,6 @@ jsonrpc-csit-1node-basic-only-aluminium,
 lispflowmapping-csit-1node-msmr-all-aluminium,
 lispflowmapping-csit-1node-performance-only-aluminium,
 lispflowmapping-csit-3node-msmr-all-aluminium,
-mdsal-csit-1node-bindingv1-only-aluminium,
 netconf-csit-1node-callhome-only-aluminium,
 netconf-csit-1node-scale-max-devices-only-aluminium,
 netconf-csit-1node-scale-only-aluminium,
@@ -74,4 +73,3 @@ openflowplugin-csit-3node-clustering-only-aluminium,
 openflowplugin-csit-3node-clustering-perf-bulkomatic-only-aluminium,
 ovsdb-csit-1node-upstream-southbound-all-aluminium,
 ovsdb-csit-3node-upstream-clustering-only-aluminium,
-yangtools-csit-1node-system-only-aluminium,

diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
index 68cef3850647fcef5c5d4a34b508f3e2d70f555b..a16bb28f2d854a37e6455e83d3191bef1de9c4d5 100644 (file)
--- a/jjb/integration/csit-jobs-magnesium.lst
+++ b/jjb/integration/csit-jobs-magnesium.lst
@@ -23,7 +23,6 @@ jsonrpc-csit-1node-basic-only-magnesium,
 lispflowmapping-csit-1node-msmr-all-magnesium,
 lispflowmapping-csit-1node-performance-only-magnesium,
 lispflowmapping-csit-3node-msmr-all-magnesium,
-mdsal-csit-1node-bindingv1-only-magnesium,
 netconf-csit-1node-callhome-only-magnesium,
 netconf-csit-1node-scale-max-devices-only-magnesium,
 netconf-csit-1node-scale-only-magnesium,
@@ -74,4 +73,3 @@ openflowplugin-csit-3node-clustering-only-magnesium,
 openflowplugin-csit-3node-clustering-perf-bulkomatic-only-magnesium,
 ovsdb-csit-1node-upstream-southbound-all-magnesium,
 ovsdb-csit-3node-upstream-clustering-only-magnesium,
-yangtools-csit-1node-system-only-magnesium,

diff --git a/jjb/integration/csit-jobs-sodium.lst b/jjb/integration/csit-jobs-sodium.lst
index 43f1e2981ff877cf1eaa7e1ae759ea28c6ba82f2..902f7143065cbfa5a53cb22add85ae350617fb1d 100644 (file)
--- a/jjb/integration/csit-jobs-sodium.lst
+++ b/jjb/integration/csit-jobs-sodium.lst
@@ -22,7 +22,6 @@ genius-csit-3node-upstream-only-sodium,
 lispflowmapping-csit-1node-msmr-all-sodium,
 lispflowmapping-csit-1node-performance-only-sodium,
 lispflowmapping-csit-3node-msmr-all-sodium,
-mdsal-csit-1node-bindingv1-only-sodium,
 netconf-csit-1node-callhome-only-sodium,
 netconf-csit-1node-scale-max-devices-only-sodium,
 netconf-csit-1node-scale-only-sodium,
@@ -75,4 +74,3 @@ ovsdb-csit-1node-upstream-southbound-all-sodium,
 ovsdb-csit-3node-upstream-clustering-only-sodium,
 sfc-csit-3node-docker-full-deploy-all-sodium,
 sfc-csit-3node-rest-basic-all-sodium,
-yangtools-csit-1node-system-only-sodium,

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index ec2d9bd124c7950c591557c25758efc1d073feca..037f11cd83b363e4781279f882885105779e722f 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -53,6 +53,7 @@
     project-name: integration-test
     jobs:
       - 'integration-distribution-test-{stream}'
+      - 'integration-distribution-mri-test-{stream}'
       - 'integration-distribution-weekly-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
@@ -61,38 +62,41 @@
       - aluminium:
           branch: 'master'
           csit-blacklist: >
-              alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
-              of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
+              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
           csit-list: !include: csit-jobs-aluminium.lst
+          csit-mri-list: '{csit-mri-list-aluminium}'
           csit-weekly-list: '{csit-weekly-list-aluminium}'
       - magnesium:
           branch: 'stable/magnesium'
           csit-blacklist: >
-              alto bier coe didm dluxapps groupbasedpolicy l2switch nemo
-              of-config p4plugin packetcable sfc sxp telemetry tsdr unimgr usc
+              alto bier coe detnet dluxapps groupbasedpolicy l2switch mdsal nemo
+              p4plugin packetcable sfc sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
           csit-list: !include: csit-jobs-magnesium.lst
+          csit-mri-list: '{csit-mri-list-magnesium}'
           csit-weekly-list: '{csit-weekly-list-magnesium}'
       - sodium:
           branch: 'stable/sodium'
           csit-blacklist: >
-              alto bier didm dluxapps groupbasedpolicy jsonrpc l2switch nemo
-              of-config p4plugin packetcable sxp telemetry tsdr unimgr usc
+              alto bier dluxapps groupbasedpolicy jsonrpc l2switch mdsal nemo
+              p4plugin packetcable sxp telemetry tsdr unimgr usc yangtools
               gate longevity sanity tdd tempest wip
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-pike
               netvirt-csit-1node-1cmb-0ctl-0cmp-openstack-queens-upstream-stateful-itm-direct
               netvirt-csit-3node-1cmb
               last-line-is-ignored-so-we-need-something-dummy-here-to-make-sure-the-real-last-line-is-used
           csit-list: !include: csit-jobs-sodium.lst
+          csit-mri-list: '{csit-mri-list-sodium}'
           csit-weekly-list: '{csit-weekly-list-sodium}'
 
 - project:
@@ -447,8 +451,9 @@
           condition-expression: $RUN_TEST
           steps:
             - trigger-builds:
-                - project: '{csit-list}'
-                  block: true
+                - project: >
+                      integration-distribution-test-{stream},
+                      integration-distribution-mri-test-{stream}
                   predefined-parameters: |
                     BUNDLE_URL=$BUNDLE_URL
                     KARAF_VERSION=$KARAF_VERSION
@@ -459,6 +464,38 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[int/dist]'
 
+- job-template:
+    name: 'integration-distribution-mri-test-{stream}'
+
+    project-type: freestyle
+    node: queue-intque-2c-1g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+
+    triggers:
+      - timed: '{schedule-weekly}'
+
+    builders:
+      - trigger-builds:
+          - project: '{csit-mri-list}'
+            block: true
+            predefined-parameters: |
+              BUNDLE_URL=$BUNDLE_URL
+              KARAF_VERSION=$KARAF_VERSION
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[integration]'
+
 - job-template:
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index aeff6c4f8a6886c3059c36b5dc60d7607860d05d..d34691fc6a425da4d544f67a83b60ba3fe92d2aa 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -27,10 +27,15 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
+
+    # odl system flavor
     odl_system_flavor: odl-standard-4
 
     # Features to install
     install-features: 'odl-restconf'
 
+    # Robot custom options:
+    robot-options: ''
+
     # Additional patterns to archive
     archive-artifacts: '*.xml'

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 36c05473f450ec40ecdf0ecec08191bc8648a634..af6eb8c0ee73451afd5b3f45422244e5ae7e7545 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,7 +2,8 @@
 - project:
     name: mdsal-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index aebfaa317a9c6a0a39fba282342f6eac89c3315e..65d658bbc0e6305fc58e790d0c8495ab2dcb53aa 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,7 +2,8 @@
 - project:
     name: odlparent-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           doc-dir: .tox/docs/tmp/html

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index cc5f94f96c40a5cbaea030bedfb29baad1f868ce..422729ebb75fba3b65bd109b8d5f17d3bb124447 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,7 +2,8 @@
 - project:
     name: yangtools-master
     jobs:
-      - 'gerrit-release-merge'
+      - 'gerrit-release-merge':
+          build-node: centos7-builder-2c-2g
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs