From 0838b15f61efd967eeadd2a32b4c2367f18a46be Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Thu, 2 Apr 2020 15:20:09 +0200 Subject: [PATCH] Convert jobs to dib Change-Id: Ie9fe810b639d60caf03d972eb966b2ab8401501a --- zuul.d/ironic-lib-jobs.yaml | 12 +++++++----- zuul.d/project.yaml | 16 ++++++++-------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/zuul.d/ironic-lib-jobs.yaml b/zuul.d/ironic-lib-jobs.yaml index a5680100..d2715e7c 100644 --- a/zuul.d/ironic-lib-jobs.yaml +++ b/zuul.d/ironic-lib-jobs.yaml @@ -15,11 +15,13 @@ - openstack/ironic-lib vars: devstack_localrc: - IRONIC_RAMDISK_TYPE: tinyipa + BUILD_TIMEOUT: 900 IRONIC_BUILD_DEPLOY_RAMDISK: True + IRONIC_TEMPEST_BUILD_TIMEOUT: 900 + IRONIC_VM_SPECS_RAM: 2048 - job: - name: ironic-lib-wholedisk-bios-ipmi-direct-tinyipa-src + name: ironic-lib-wholedisk-bios-ipmi-direct-src parent: ironic-lib-base timeout: 7200 vars: @@ -36,7 +38,7 @@ SWIFT_TEMPURL_KEY: secretkey - job: - name: ironic-lib-partition-bios-ipmi-direct-tinyipa-src + name: ironic-lib-partition-bios-ipmi-direct-src parent: ironic-lib-base timeout: 7200 vars: @@ -51,13 +53,13 @@ SWIFT_TEMPURL_KEY: secretkey - job: - name: ironic-lib-partition-bios-ipmi-iscsi-tinyipa-src + name: ironic-lib-partition-bios-ipmi-iscsi-src parent: ironic-lib-base timeout: 7200 - job: - name: ironic-lib-wholedisk-bios-ipmi-iscsi-tinyipa-src + name: ironic-lib-wholedisk-bios-ipmi-iscsi-src parent: ironic-lib-base timeout: 7200 vars: diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 06858cc5..f2b642ee 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -7,17 +7,17 @@ - publish-openstack-docs-pti check: jobs: - - ironic-lib-wholedisk-bios-ipmi-direct-tinyipa-src - - ironic-lib-partition-bios-ipmi-direct-tinyipa-src - - ironic-lib-partition-bios-ipmi-iscsi-tinyipa-src - - ironic-lib-wholedisk-bios-ipmi-iscsi-tinyipa-src + - ironic-lib-wholedisk-bios-ipmi-direct-src + - ironic-lib-partition-bios-ipmi-direct-src + - ironic-lib-partition-bios-ipmi-iscsi-src + - ironic-lib-wholedisk-bios-ipmi-iscsi-src gate: queue: ironic jobs: - - ironic-lib-wholedisk-bios-ipmi-direct-tinyipa-src - - ironic-lib-partition-bios-ipmi-direct-tinyipa-src - - ironic-lib-partition-bios-ipmi-iscsi-tinyipa-src - - ironic-lib-wholedisk-bios-ipmi-iscsi-tinyipa-src + - ironic-lib-wholedisk-bios-ipmi-direct-src + - ironic-lib-partition-bios-ipmi-direct-src + - ironic-lib-partition-bios-ipmi-iscsi-src + - ironic-lib-wholedisk-bios-ipmi-iscsi-src post: jobs: - ironic-python-agent-build-image-tinyipa