From c3c7ac20c47946610a5e690e822fd6d1dd342b47 Mon Sep 17 00:00:00 2001 From: Luis Gomez Date: Sun, 26 Apr 2020 15:39:50 -0700 Subject: [PATCH] Add MRI CSIT list and distribution test - MRI dist test will run once a week. - MRI dist test can be triggered from multipatch job. Change-Id: I74e5fbc222c482d384503f255183c5e684ba8e6d Signed-off-by: Luis Gomez Signed-off-by: Anil Belur --- jjb/defaults.yaml | 6 +++ jjb/integration/integration-test-jobs.yaml | 53 ++++++++++++++++++---- jjb/mdsal/mdsal-csit-bindingv1.yaml | 5 ++ 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml index 43cdb93cf..2edafdf1b 100644 --- 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/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index ec2d9bd12..037f11cd8 100644 --- 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 aeff6c4f8..d34691fc6 100644 --- 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' -- 2.36.6