Skip to content

fixing ssh-key issue #212

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

Merged
merged 2 commits into from
Mar 27, 2025
Merged

fixing ssh-key issue #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9d647f
fixing ssh-key issue
Mar 26, 2025
acbb229
fixing region
Mar 26, 2025
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
20 changes: 10 additions & 10 deletions modules/landing_zone_vsi/image_map.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@ locals {
"us-south" = "r006-045e03ee-4cfa-4415-a4ec-d8bceadc1bdb"
},
"hpc-lsf10-rhel810-v2" = {
"eu-es" = "r050-4f5c092b-aeaf-483c-bcf8-f9d3c39199c6"
"eu-gb" = "r018-74ea9522-076f-4b51-b8f3-b11db07b663f"
"eu-de" = "r010-8800a619-c9f2-4519-af4c-f6d626825dd5"
"us-east" = "r014-2ad1515b-38b9-4b46-8ff1-0a0488590c67"
"us-south" = "r006-724e700a-d5c3-42e6-9559-8808bd359ef4"
"jp-tok" = "r022-e54fad74-7b2f-4ed1-8c2d-b6436f880cf1"
"jp-osa" = "r034-43c31e3f-008a-45d0-89b1-fbd8ed51b3fe"
"au-syd" = "r026-fcfdd9b4-23e6-445b-bebe-4f9b8cdaa16f"
"br-sao" = "r042-6f8cbdf8-bfd9-4127-86b3-b130e1ce2b36"
"ca-tor" = "r038-e374450a-c76a-4a3b-9440-4e3787d17221"
"eu-es" = "r050-86c03f46-e10a-4edf-8fcf-103845362db9"
"eu-gb" = "r018-90675b8a-db1b-4a41-b5a0-f21c04cb7d57"
"eu-de" = "r010-dd925c68-d186-406b-a8f7-8d965c60512b"
"us-east" = "r014-4bc87a52-d377-43da-a042-aa1fa1629d28"
"us-south" = "r006-6540f00a-525d-4f62-8a35-f218520b37d2"
"jp-tok" = "r022-02a31841-c5ca-4527-a660-d8e5b1cfb29e"
"jp-osa" = "r034-c7e76920-e735-4702-b04c-1f2cffe170cb"
"au-syd" = "r026-ad5cdb8f-1c44-4267-8969-fe62ac0e93a4"
"br-sao" = "r042-b89b9b8c-a934-4f9d-88bc-b9a15866f223"
"ca-tor" = "r038-d5992a56-ddd1-4156-a98c-54ecef51ae3d"
}
}
}
6 changes: 3 additions & 3 deletions tests/lsf/cluster_utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func LSFControlBctrld(t *testing.T, sClient *ssh.Client, startOrStop string, log

// Sleep for a specified duration to allow time for the daemon to start or stop
if startOrStop == "stop" {
time.Sleep(30 * time.Second)
time.Sleep(63 * time.Second)
} else {
time.Sleep(120 * time.Second)
}
Expand Down Expand Up @@ -1305,8 +1305,8 @@ func VerifyEncryption(t *testing.T, apiKey, region, resourceGroup, clusterPrefix
fileSharesCmd = fmt.Sprintf("ibmcloud is shares | grep %s | awk 'NR>1 {print $2}'", clusterPrefix)
}

// Retrieve the list of file shares
fileSharesOutput, err := exec.Command("bash", "-c", fileSharesCmd).CombinedOutput()
// // Retrieve the list of file shares (retry once after 2s if it fails)
fileSharesOutput, err := utils.RunCommandWithRetry(fileSharesCmd, 1, 60*time.Second)
if err != nil {
return fmt.Errorf("failed to retrieve file shares: %w", err)
}
Expand Down
18 changes: 18 additions & 0 deletions tests/utilities/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,3 +564,21 @@ func GetFirstWorkerNodeInstanceType(t *testing.T, terraformVars map[string]inter
logger.Info(t, fmt.Sprintf("First Worker Node Instance Type: %s", instanceTypeStr))
return instanceTypeStr, nil
}

// RunCommandWithRetry executes a shell command with retries
func RunCommandWithRetry(cmd string, retries int, delay time.Duration) ([]byte, error) {
var output []byte
var err error

for i := 0; i <= retries; i++ {
output, err = exec.Command("bash", "-c", cmd).CombinedOutput()
if err == nil {
return output, nil
}
if i < retries {
time.Sleep(delay) // Wait before retrying
}
}

return output, err
}