Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Deprovision on failure from OCP provisioning task #1924

Merged
merged 6 commits into from
Oct 16, 2024
Merged

Remove Deprovision on failure from OCP provisioning task #1924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b81017e
rm Deprovision on failure
bdattoma Oct 14, 2024
f1cd733
Merge branch 'master' into rm_deprovision_on_failure
bdattoma Oct 14, 2024
0029700
remove deprovision-related resources
bdattoma Oct 14, 2024
0dc83a8
update fail message
bdattoma Oct 14, 2024
863f360
Merge branch 'master' into rm_deprovision_on_failure
bdattoma Oct 15, 2024
83135b8
Merge branch 'master' into rm_deprovision_on_failure
bdattoma Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 0 additions & 72 deletions ods_ci/tasks/Resources/Provisioning/Hive/deprovision.robot
View file
Open in desktop

This file was deleted.

8 changes: 2 additions & 6 deletions ods_ci/tasks/Resources/Provisioning/Hive/provision.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
*** Settings ***
Resource deprovision.robot
Resource ../../../../tests/Resources/Common.robot
Library Process

Expand Down Expand Up @@ -72,9 +71,7 @@
${result} = Run Process oc -n ${hive_namespace} get cd ${cluster_name} -o json | jq -r '.status.webConsoleURL' --exit-status shell=yes # robocop: disable:line-too-long
END
IF ${result.rc} != 0
Log Cluster '${cluster_name}' has previously failed to be provisioned - Cleaning Hive resources
... console=True
Delete Cluster Configuration
FAIL Cluster '${cluster_name}' has previously failed to be provisioned but some Hive and/or Cloud resources are still present.

Check warning

Code scanning / Robocop

Line is too long ({{ line_length }}/{{ allowed_length }}) Warning

Line is too long (137/120)
ELSE
FAIL Cluster '${cluster_name}' is already in use, please choose a different name.
END
Expand Down Expand Up @@ -210,9 +207,8 @@
${provision_status} = Run Process oc -n ${pool_namespace} get cd ${clusterdeployment_name} -o json shell=yes # robocop: disable:line-too-long
${custer_status} = Run Process oc -n ${hive_namespace} get clusterclaim ${claim_name} -o json shell=yes
Log Cluster '${cluster_name}' deployment had errors, see: ${\n}${provision_status.stdout}${\n}${custer_status.stdout} level=ERROR # robocop: disable:line-too-long
Log Cluster '${cluster_name}' install completed, but it is not accessible - Cleaning Hive resources now
Log Cluster '${cluster_name}' install completed, but it is not accessible
... console=True
Deprovision Cluster
FAIL Cluster '${cluster_name}' provisioning failed. Please look into the logs for more details.
END
Log Cluster '${cluster_name}' install completed and accessible at: ${web_access.stdout} console=True
Expand Down
9 changes: 0 additions & 9 deletions ods_ci/tasks/Tasks/provision_self_managed_cluster.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ Documentation Provision Self-Managed clusters for testing. The cluster provis
Metadata provision
Resource ../../tests/Resources/Common.robot
Resource ../Resources/Provisioning/Hive/provision.robot
Resource ../Resources/Provisioning/Hive/deprovision.robot
Resource ../Resources/Provisioning/Hive/gpu-provision.robot
Resource ../Resources/Provisioning/Hive/disconnect.robot
Library OperatingSystem
Expand Down Expand Up @@ -38,14 +37,6 @@ Provision Self-Managed Cluster
Login To Cluster
Pass Execution Self-Managed Cluster ${cluster_name} provisionend successfully

Deprovision Self-Managed Cluster
[Documentation] Deprovision a self-managed cluster
[Tags] self_managed_deprovision
[Setup] Run Keywords Set Hive Default Variables
... AND
... Set ClusterPool Variables
Deprovision Cluster

Add GPU Node To Self-Managed AWS Cluster
[Documentation] Add GPU node to self-managed cluster
[Tags] gpu_node_aws_self_managed_provision
Expand Down
Loading