Merge remote-tracking branch 'altinity/0.24.4' into 0.24.4

Author: sunsingerus

tests/e2e/manifests/chi/test-009-operator-upgrade-2.yaml

@@ -73,8 +73,8 @@ spec:
               volumeMounts:
                 - name: aws-ebs-volume-claim
                   mountPath: /var/lib/clickhouse
-              lifecycle:
-                preStop:
-                  exec:
-                    command: ["/bin/sh", "-c", "pkill -SIGTERM clickhouse-server"]
+              command:
+                - /bin/bash
+                - -c
+                - /usr/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml
           terminationGracePeriodSeconds: 360

tests/e2e/test_operator.py

@@ -512,7 +512,7 @@ def test_operator_upgrade(self, manifest, service, version_from, version_to=None
     with When("I create new shells"):
         shell_1 = get_shell()
         shell_2 = get_shell()
-        shell_3 = get_shell()
+        # shell_3 = get_shell()
 
     Check("run query until receive stop event", test=run_select_query, parallel=True)(
         host=service,
@@ -574,7 +574,7 @@ def test_operator_upgrade(self, manifest, service, version_from, version_to=None
 @Name("test_009_1. Test operator upgrade")
 @Requirements(RQ_SRS_026_ClickHouseOperator_Managing_UpgradingOperator("1.0"))
 @Tags("NO_PARALLEL")
-def test_009_1(self, version_from="0.23.7", version_to=None):
+def test_009_1(self, version_from="0.24.3", version_to=None):
     if version_to is None:
         version_to = self.context.operator_version
 
@@ -590,7 +590,7 @@ def test_009_1(self, version_from="0.23.7", version_to=None):
 @TestScenario
 @Name("test_009_2. Test operator upgrade")
 @Tags("NO_PARALLEL")
-def test_009_2(self, version_from="0.23.7", version_to=None):
+def test_009_2(self, version_from="0.24.3", version_to=None):
     if version_to is None:
         version_to = self.context.operator_version