All csi tests - small fixes

Author: mrwesadex-flant

internal/config/config.go

@@ -36,7 +36,7 @@ var DefaultSetupVM = ClusterNode{
 // Timeout constants for various operations during cluster creation and management
 const (
 	// VM operations
-	VMCreationTimeout                   = 20 * time.Second // Timeout for creating VMs
+	VMCreationTimeout                   = 20 * time.Minute // Timeout for creating VMs (includes ClusterVirtualImage creation which can take up to 15 minutes)
 	VMsRunningTimeout                   = 20 * time.Minute // Timeout for waiting for all VMs to become Running state
 	VMInfoTimeout                       = 30 * time.Second // Timeout for gathering VM information
 	ClusterVirtualImageReadinessTimeout = 15 * time.Minute // Timeout for waiting for ClusterVirtualImage to become provisioned (Ready)

pkg/cluster/setup.go

@@ -106,9 +106,17 @@ func GetOSInfo(ctx context.Context, sshClient ssh.SSHClient) (*OSInfo, error) {
 // Since the setup node is always Ubuntu 22.04, this function uses apt to install docker.io.
 // It runs: apt update && apt install docker.io -y, then starts docker and verifies with docker ps.
 func InstallDocker(ctx context.Context, sshClient ssh.SSHClient) error {
+	// Wait for apt locks to be released (handles unattended-upgrades, apt-daily, etc.)
+	// This is necessary because freshly booted Ubuntu VMs often have automatic update processes running
+	waitForLockCmd := `while sudo fuser /var/lib/dpkg/lock-frontend /var/lib/apt/lists/lock /var/cache/apt/archives/lock >/dev/null 2>&1; do echo "Waiting for apt locks..."; sleep 5; done`
+	output, err := sshClient.Exec(ctx, waitForLockCmd)
+	if err != nil {
+		return fmt.Errorf("failed to wait for apt locks: %w\nOutput: %s", err, output)
+	}
+
 	// Update package list and install docker.io
 	cmd := "sudo apt-get update && sudo apt-get install -y docker.io"
-	output, err := sshClient.Exec(ctx, cmd)
+	output, err = sshClient.Exec(ctx, cmd)
 	if err != nil {
 		return fmt.Errorf("failed to update packages and install docker.io: %w\nOutput: %s", err, output)
 	}

tests/csi-all-stress-tests/cluster_config.yml

@@ -44,7 +44,7 @@ clusterDefinition:
     serviceSubnetCIDR: "10.225.0.0/16"
     clusterDomain: "cluster.local"
     registryRepo: "dev-registry.deckhouse.io/sys/deckhouse-oss"
-    devBranch: "main"
+    devBranch: "pr17504"
     # Module configuration
     modules:
       - name: "snapshot-controller" # TODO add MPO

tests/csi-all-stress-tests/csi_all_stress_tests_test.go

@@ -261,17 +261,16 @@ var _ = Describe("All CSIs Stress Tests", Ordered, func() {
 	})
 
 	It("should run snapshot/resize/clone stress test for all storage classes", func() {
-		storageClassNames := []string{"hsclass-200", "hpe", "netapp"}
 
 		testResults := make(map[string]error)
 
 		for _, scName := range storageClassNames {
 			func(storageClassName string) {
 				// Use a timeout context for each stress test
-				ctx, cancel := context.WithTimeout(context.Background(), 15*time.Minute)
+				ctx, cancel := context.WithTimeout(context.Background(), 30*time.Minute)
 				defer cancel()
 
-				By("Running snapshot, resize, and clone stress test for "+storageClassName+" (15 minutes timeout)", func() {
+				By("Running snapshot, resize, and clone stress test for "+storageClassName+" (30 minutes timeout)", func() {
 					GinkgoWriter.Printf("    ▶️ Running complex stress test for %s...\n", storageClassName)
 
 					// Configure comprehensive stress test

tests/csi-all-stress-tests/files/csi-huawei-cr.yml

@@ -25,28 +25,4 @@ spec:
   pool: prod
   reclaimPolicy: Delete
   storageConnectionName: hsconn-200
----
-apiVersion: storage.deckhouse.io/v1alpha1
-kind: HuaweiStorageClass
-metadata:
-  name: huawei-fc-200
-spec:
-  fsType: ext4
-  pool: prod
-  reclaimPolicy: Delete
-  storageConnectionName: huawei-fc-200
----
-apiVersion: storage.deckhouse.io/v1alpha1
-kind: HuaweiStorageConnection
-metadata:
-  name: huawei-fc-200
-spec:
-  login: admin_200
-  maxClientThreads: 30
-  password: '${HUAWEI_PASSWORD}'
-  pools:
-  - prod
-  protocol: FC
-  storageType: OceanStorSAN
-  urls:
-  - https://10.200.0.101:8088
+