From f6bf8622df5f51147c55e5aeac8b006af97fec40 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Sat, 4 Jul 2020 09:55:27 +0200 Subject: [PATCH] Fix Patrole jobs in Functest multijobs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ib026ec978353835ba64eea4523b5949416cfc115 Signed-off-by: Cédric Ollivier --- jjb/functest/functest.ovn.yaml | 47 ++++++++++++++++++++++++++++++++++++++++++ jjb/functest/functest.yaml | 18 ++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml index 96fa688fb..80a47b9dd 100644 --- a/jjb/functest/functest.ovn.yaml +++ b/jjb/functest/functest.ovn.yaml @@ -328,6 +328,9 @@ - tempest_scenario - tempest_slow - patrole + - patrole_admin + - patrole_member + - patrole_reader - neutron_trunk - networking-bgpvpn - networking-sfc @@ -342,6 +345,8 @@ test: networking-bgpvpn - tag: latest test: networking-sfc + - tag: latest + test: patrole - tag: kali test: refstack_defcore - tag: kali @@ -350,6 +355,12 @@ test: networking-bgpvpn - tag: kali test: networking-sfc + - tag: kali + test: patrole_admin + - tag: kali + test: patrole_member + - tag: kali + test: patrole_reader - tag: jerma test: refstack_defcore - tag: jerma @@ -358,10 +369,22 @@ test: networking-bgpvpn - tag: jerma test: networking-sfc + - tag: jerma + test: patrole_admin + - tag: jerma + test: patrole_member + - tag: jerma + test: patrole_reader - tag: iruya test: refstack_defcore - tag: iruya test: neutron_trunk + - tag: iruya + test: patrole_admin + - tag: iruya + test: patrole_member + - tag: iruya + test: patrole_reader - tag: hunter test: refstack_compute - tag: hunter @@ -374,6 +397,12 @@ test: neutron_trunk - tag: hunter test: tempest_telemetry + - tag: hunter + test: patrole_admin + - tag: hunter + test: patrole_member + - tag: hunter + test: patrole_reader jobs: - 'functest-ovn-{repo}-{container}-{tag}-{test}-run' @@ -578,6 +607,12 @@ <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_admin-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_member-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_reader-run' + <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -910,6 +945,12 @@ <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_admin-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_member-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_reader-run' + <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -1129,6 +1170,12 @@ <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_admin-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_member-run' + <<: *functest-ovn-jobs + - name: 'functest-ovn-opnfv-functest-smoke-{tag}-patrole_reader-run' + <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-ovn-jobs - name: 'functest-ovn-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml index a424f500a..40804b453 100644 --- a/jjb/functest/functest.yaml +++ b/jjb/functest/functest.yaml @@ -608,6 +608,12 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_admin-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_member-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -940,6 +946,12 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_admin-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_member-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' @@ -1159,6 +1171,12 @@ <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run' <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_admin-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_member-run' + <<: *functest-jobs + - name: 'functest-opnfv-functest-smoke-{tag}-patrole_reader-run' + <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run' <<: *functest-jobs - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run' -- 2.16.6