From 0e27eba2f55b027a5ec1a648753926d1e874eb85 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Wed, 19 Aug 2020 17:34:47 +0200 Subject: [PATCH] Add a CI job with UEFI+vmedia and clean up the job definitions Reuse parent jobs from ironic and rename the jobs accordingly. Change-Id: Ic64536c0ce51820461d82f1d0d498e2754a58ed7 --- zuul.d/project.yaml | 6 ++++-- zuul.d/sushy-jobs.yaml | 21 +++++++++++---------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 68411bc5..edc2d250 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -8,7 +8,9 @@ - release-notes-jobs-python3 check: jobs: - - sushy-tempest-ironic-partition-redfish-src + - sushy-tempest-partition-bios-redfish-pxe + - sushy-tempest-partition-uefi-redfish-vmedia gate: jobs: - - sushy-tempest-ironic-partition-redfish-src + - sushy-tempest-partition-bios-redfish-pxe + - sushy-tempest-partition-uefi-redfish-vmedia diff --git a/zuul.d/sushy-jobs.yaml b/zuul.d/sushy-jobs.yaml index e6c4d6a2..79145832 100644 --- a/zuul.d/sushy-jobs.yaml +++ b/zuul.d/sushy-jobs.yaml @@ -1,16 +1,17 @@ - job: - name: sushy-tempest-ironic-partition-redfish-src - parent: ironic-base + name: sushy-tempest-partition-bios-redfish-pxe + parent: ironic-tempest-partition-bios-redfish-pxe + irrelevant-files: + - ^test-requirements.txt$ + - ^sushy/tests/.*$ + required-projects: + - openstack/sushy + +- job: + name: sushy-tempest-partition-uefi-redfish-vmedia + parent: ironic-tempest-partition-uefi-redfish-vmedia irrelevant-files: - ^test-requirements.txt$ - ^sushy/tests/.*$ - timeout: 5400 required-projects: - openstack/sushy - vars: - devstack_localrc: - IRONIC_DEFAULT_BOOT_OPTION: netboot - IRONIC_DEPLOY_DRIVER: redfish - IRONIC_ENABLED_HARDWARE_TYPES: redfish - IRONIC_DEFAULT_RESCUE_INTERFACE: "" - EBTABLES_RACE_FIX: True