Merge pull request #1169 from percona/improve-pvc-resize

K8SPS-553 improve pvc-resize test

Author: valmiranogueira

e2e-tests/tests/pvc-resize/02-assert.yaml

@@ -1,6 +1,6 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
-timeout: 120
+timeout: 60
 ---
 apiVersion: v1
 kind: ConfigMap

e2e-tests/tests/pvc-resize/02-write-data.yaml

@@ -1,7 +1,7 @@
 apiVersion: kuttl.dev/v1beta1
 kind: TestStep
 commands:
-  - timeout: 180
+  - timeout: 60
     script: |-
       set -o errexit
       set -o xtrace
@@ -13,11 +13,7 @@ commands:
           "CREATE DATABASE IF NOT EXISTS pvctest; CREATE TABLE IF NOT EXISTS pvctest.data (id int PRIMARY KEY, data text)" \
           "-h $haproxy_svc"
 
-      for i in {1..50}; do
-          run_mysql \
-              "INSERT pvctest.data (id, data) VALUES ($i, 'test data row $i with some content to use storage space')" \
-              "-h $haproxy_svc"
-      done
+      run_mysql_query_file "conf/initial-data.sql" "-h $haproxy_svc"
 
       # Store initial data count for verification
       count=$(run_mysql "SELECT COUNT(*) FROM pvctest.data" "-h $haproxy_svc")

e2e-tests/tests/pvc-resize/conf/initial-data.sql

@@ -0,0 +1,20 @@
+USE pvctest;
+DROP PROCEDURE IF EXISTS insert_pvc_test_data;
+
+DELIMITER //
+
+CREATE PROCEDURE insert_pvc_test_data()
+BEGIN
+  DECLARE i INT DEFAULT 1;
+  WHILE i <= 50 DO
+    INSERT INTO data (id, data)
+    VALUES (i, CONCAT('test data row ', i, ' with some content to use storage space'));
+    SET i = i + 1;
+  END WHILE;
+END;
+//
+
+DELIMITER ;
+
+CALL insert_pvc_test_data();
+DROP PROCEDURE insert_pvc_test_data;