From a578a638ef1ad46dfc7ea7866f9585a859b9423d Mon Sep 17 00:00:00 2001 From: Shubham Ganar Date: Fri, 19 Apr 2024 12:34:42 +0530 Subject: [PATCH] Provisioning test workflow name changes Signed-off-by: Shubham Ganar --- conf/provisioning.yaml.template | 2 ++ pytest_fixtures/component/provision_capsule_pxe.py | 2 +- pytest_fixtures/component/provision_pxe.py | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/conf/provisioning.yaml.template b/conf/provisioning.yaml.template index 308686cf84e..d2e547d91be 100644 --- a/conf/provisioning.yaml.template +++ b/conf/provisioning.yaml.template @@ -3,3 +3,5 @@ PROVISIONING: HOST_ROOT_PASSWORD: HOST_SSH_KEY_PRIV: HOST_SSH_KEY_PUB: + PROVISIONING_SAT_WORKFLOW: + PROVISIONING_HOST_WORKFLOW: diff --git a/pytest_fixtures/component/provision_capsule_pxe.py b/pytest_fixtures/component/provision_capsule_pxe.py index c1dadd9589a..a48b42ddc60 100644 --- a/pytest_fixtures/component/provision_capsule_pxe.py +++ b/pytest_fixtures/component/provision_capsule_pxe.py @@ -35,7 +35,7 @@ def capsule_provisioning_sat( sat = module_target_sat provisioning_domain_name = f"{gen_string('alpha').lower()}.foo" broker_data_out = Broker().execute( - workflow='configure-install-sat-provisioning-rhv', + workflow=settings.provisioning.provisioning_sat_workflow, artifacts='last', target_vlan_id=settings.provisioning.vlan_id, target_host=module_capsule_configured.name, diff --git a/pytest_fixtures/component/provision_pxe.py b/pytest_fixtures/component/provision_pxe.py index 2ce6a642411..44d966a3b99 100644 --- a/pytest_fixtures/component/provision_pxe.py +++ b/pytest_fixtures/component/provision_pxe.py @@ -146,8 +146,8 @@ def module_provisioning_sat( provisioning_domain_name = f"{gen_string('alpha').lower()}.foo" broker_data_out = Broker().execute( - workflow="configure-install-sat-provisioning-rhv", - artifacts="last", + workflow=settings.provisioning.provisioning_sat_workflow, + artifacts='last', target_vlan_id=settings.provisioning.vlan_id, target_host=sat.name, provisioning_dns_zone=provisioning_domain_name, @@ -217,7 +217,7 @@ def provisioning_host(module_ssh_key_file, pxe_loader): "" # TODO: Make this an optional fixture parameter (update vm_firmware when adding this) ) with Broker( - workflow="deploy-configure-pxe-provisioning-host-rhv", + workflow=settings.provisioning.provisioning_host_workflow, host_class=ContentHost, target_vlan_id=vlan_id, target_vm_firmware=pxe_loader.vm_firmware, @@ -239,7 +239,7 @@ def provision_multiple_hosts(module_ssh_key_file, pxe_loader, request): "" # TODO: Make this an optional fixture parameter (update vm_firmware when adding this) ) with Broker( - workflow="deploy-configure-pxe-provisioning-host-rhv", + workflow=settings.provisioning.provisioning_host_workflow, host_class=ContentHost, _count=getattr(request, 'param', 2), target_vlan_id=vlan_id,