From c88132544eeb67446636ad96ff342889fd4a95d7 Mon Sep 17 00:00:00 2001 From: Dariusz Smigiel Date: Fri, 22 Sep 2023 12:56:41 -0700 Subject: [PATCH] Bump flavor for EDPM baremetal job. We are moving to a new flavor with spec: 24vcpu/48GB ram/ 400 GB disk. Bumping cpus of crc to 12, and edpm node cpu to 6, ram to 8GB, and disk to 40GB. --- scenarios/centos-9/edpm_baremetal_deployment_ci.yml | 4 +++- zuul.d/edpm.yaml | 4 ++-- zuul.d/nodeset.yaml | 6 ++++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/scenarios/centos-9/edpm_baremetal_deployment_ci.yml b/scenarios/centos-9/edpm_baremetal_deployment_ci.yml index 85ac7a2ee5..9e401ca078 100644 --- a/scenarios/centos-9/edpm_baremetal_deployment_ci.yml +++ b/scenarios/centos-9/edpm_baremetal_deployment_ci.yml @@ -6,7 +6,9 @@ cifmw_install_yamls_vars: STORAGE_CLASS: crc-csi-hostpath-provisioner DATAPLANE_REPO: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/dataplane-operator" INFRA_REPO: "{{ ansible_user_dir }}/src/github.com/openstack-k8s-operators/infra-operator" - BMAAS_INSTANCE_MEMORY: 6144 + BMAAS_INSTANCE_MEMORY: 8192 + BMAAS_INSTANCE_VCPUS: 6 + BMAAS_INSTANCE_DISK_SIZE: 40 pre_infra: - name: Download needed tools diff --git a/zuul.d/edpm.yaml b/zuul.d/edpm.yaml index 5cd8b6e378..0ae64b2a70 100644 --- a/zuul.d/edpm.yaml +++ b/zuul.d/edpm.yaml @@ -11,11 +11,11 @@ # Virtual Baremetal job with CRC and single compute node. - job: name: cifmw-crc-podified-edpm-baremetal - nodeset: centos-9-crc-4xlarge + nodeset: centos-9-crc-6xlarge parent: cifmw-base-crc-openstack run: ci/playbooks/edpm_baremetal_deployment/run.yml vars: - crc_parameters: "--memory 32000 --disk-size 120 --cpus 10" + crc_parameters: "--memory 32000 --disk-size 240 --cpus 12" # Podified galera job - job: diff --git a/zuul.d/nodeset.yaml b/zuul.d/nodeset.yaml index f1ea360762..7b23034a4e 100644 --- a/zuul.d/nodeset.yaml +++ b/zuul.d/nodeset.yaml @@ -23,6 +23,12 @@ - name: controller label: centos-9-stream-crc-4xlarge +- nodeset: + name: centos-9-crc-6xlarge + nodes: + - name: controller + label: centos-9-stream-crc-6xlarge + - nodeset: name: centos-stream-9 nodes: