Merge "Add ironic-standalone-redfish"

2 files changed, 65 insertions, 2 deletions

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 24ca4afbe..d59f2736c 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -87,7 +87,9 @@
 
 - job:
     name: ironic-standalone
-    description: Test ironic standalone
+    description:
+      Test ironic standalone configured with ipmi hardware type, iscsi and
+      direct deploy interfaces, rescue enabled.
     parent: ironic-base
     irrelevant-files:
       - ^.*\.rst$
@@ -109,7 +111,7 @@
         IRONIC_AUTOMATED_CLEAN_ENABLED: False
         IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
         IRONIC_DEFAULT_RESCUE_INTERFACE: agent
-        IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible"
+        IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct"
         IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue"
         IRONIC_RAMDISK_TYPE: tinyipa
         IRONIC_RPC_TRANSPORT: json-rpc
@@ -139,6 +141,65 @@
         s-proxy: True
 
 - job:
+    name: ironic-standalone-redfish
+    parent: ironic-base
+    description:
+      Test ironic standalone configured with redfish hardware type, iscsi and
+      direct and ansible deploy interfaces, rescue it's not enabled.
+    required-projects:
+      - openstack/sushy-tools
+    irrelevant-files:
+      - ^.*\.rst$
+      - ^api-ref/.*$
+      - ^doc/.*$
+      - ^install-guide/.*$
+      - ^ironic/locale/.*$
+      - ^ironic/tests/.*$
+      - ^releasenotes/.*$
+      - ^setup.cfg$
+      - ^test-requirements.txt$
+      - ^tools/.*$
+      - ^tox.ini$
+    vars:
+      tempest_test_regex: ironic_standalone
+      tempest_concurrency: 2
+      devstack_localrc:
+        FORCE_CONFIG_DRIVE: False
+        IRONIC_AUTOMATED_CLEAN_ENABLED: False
+        IRONIC_DEPLOY_DRIVER: redfish
+        IRONIC_ENABLED_HARDWARE_TYPES: redfish
+        IRONIC_ENABLED_POWER_INTERFACES: redfish
+        IRONIC_ENABLED_MANAGEMENT_INTERFACES: redfish
+        IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
+        IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible"
+        IRONIC_RPC_TRANSPORT: json-rpc
+        IRONIC_RAMDISK_TYPE: tinyipa
+        IRONIC_VM_COUNT: 6
+        IRONIC_VM_VOLUME_COUNT: 2
+        IRONIC_VM_SPECS_RAM: 384
+        # We're using a lot of disk space in this job. Some testing nodes have
+        # a small root partition, so use /opt which is mounted from a bigger
+        # ephemeral partition on such nodes
+        LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
+        SWIFT_ENABLE_TEMPURLS: True
+        SWIFT_TEMPURL_KEY: secretkey
+      devstack_services:
+        n-api: False
+        n-api-meta: False
+        n-cauth: False
+        n-cond: False
+        n-cpu: False
+        n-novnc: False
+        n-obj: False
+        n-sch: False
+        nova: False
+        placement-api: False
+        s-account: True
+        s-container: True
+        s-object: True
+        s-proxy: True
+
+- job:
     name: ironic-tempest-partition-bios-redfish-pxe
     description: "Deploy ironic node over PXE using BIOS boot mode"
     parent: ironic-base
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1e3604645..aaeff6c86 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,6 +11,8 @@
       jobs:
         - ironic-tox-unit-with-driver-libs
         - ironic-standalone
+        - ironic-standalone-redfish:
+            voting: false
         - ironic-tempest-functional-python3
         - ironic-grenade
         # Temporary disable voting because of end of cycle CI instability.