Try to fix issue with tests

cvat-ai · Oct 8, 2024 · b240baf · b240baf
1 parent d12ad5b
commit b240baf
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 67 deletions.
diff --git a/helm-chart/templates/cvat_backend/worker_analyticsreports/deployment.yml b/helm-chart/templates/cvat_backend/worker_analyticsreports/deployment.yml
@@ -61,16 +61,6 @@ spec:
           {{- with concat .Values.cvat.backend.additionalEnv $localValues.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- if .Values.cvat.backend.worker.readinessProbe.enabled }}
-          readinessProbe:
-            exec:
-              command:
-              - python
-              - manage.py
-              - workerprobe
-              - analytics_reports
-            {{- toYaml (omit .Values.cvat.backend.worker.readinessProbe "enabled") | nindent 12 }}
-          {{- end }}
           {{- if .Values.cvat.backend.worker.livenessProbe.enabled }}
           livenessProbe:
             exec:

diff --git a/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml b/helm-chart/templates/cvat_backend/worker_annotation/deployment.yml
@@ -60,16 +60,6 @@ spec:
           {{- with concat .Values.cvat.backend.additionalEnv $localValues.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- if .Values.cvat.backend.worker.readinessProbe.enabled }}
-          readinessProbe:
-            exec:
-              command:
-              - python
-              - manage.py
-              - workerprobe
-              - annotation
-            {{- toYaml (omit .Values.cvat.backend.worker.readinessProbe "enabled") | nindent 12 }}
-          {{- end }}
           {{- if .Values.cvat.backend.worker.livenessProbe.enabled }}
           livenessProbe:
             exec:

diff --git a/helm-chart/templates/cvat_backend/worker_export/deployment.yml b/helm-chart/templates/cvat_backend/worker_export/deployment.yml
@@ -61,16 +61,6 @@ spec:
           {{- with concat .Values.cvat.backend.additionalEnv $localValues.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- if .Values.cvat.backend.worker.readinessProbe.enabled }}
-          readinessProbe:
-            exec:
-              command:
-              - python
-              - manage.py
-              - workerprobe
-              - export
-            {{- toYaml (omit .Values.cvat.backend.worker.readinessProbe "enabled") | nindent 12 }}
-          {{- end }}
           {{- if .Values.cvat.backend.worker.livenessProbe.enabled }}
           livenessProbe:
             exec:

diff --git a/helm-chart/templates/cvat_backend/worker_import/deployment.yml b/helm-chart/templates/cvat_backend/worker_import/deployment.yml
@@ -60,16 +60,6 @@ spec:
           {{- with concat .Values.cvat.backend.additionalEnv $localValues.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- if .Values.cvat.backend.worker.readinessProbe.enabled }}
-          readinessProbe:
-            exec:
-              command:
-              - python
-              - manage.py
-              - workerprobe
-              - import
-            {{- toYaml (omit .Values.cvat.backend.worker.readinessProbe "enabled") | nindent 12 }}
-          {{- end }}
           {{- if .Values.cvat.backend.worker.livenessProbe.enabled }}
           livenessProbe:
             exec:

diff --git a/helm-chart/templates/cvat_backend/worker_qualityreports/deployment.yml b/helm-chart/templates/cvat_backend/worker_qualityreports/deployment.yml
@@ -60,16 +60,6 @@ spec:
           {{- with concat .Values.cvat.backend.additionalEnv $localValues.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- if .Values.cvat.backend.worker.readinessProbe.enabled }}
-          readinessProbe:
-            exec:
-              command:
-              - python
-              - manage.py
-              - workerprobe
-              - quality_reports
-            {{- toYaml (omit .Values.cvat.backend.worker.readinessProbe "enabled") | nindent 12 }}
-          {{- end }}
           {{- if .Values.cvat.backend.worker.livenessProbe.enabled }}
           livenessProbe:
             exec:

diff --git a/helm-chart/templates/cvat_backend/worker_webhooks/deployment.yml b/helm-chart/templates/cvat_backend/worker_webhooks/deployment.yml
@@ -60,16 +60,7 @@ spec:
           {{- with concat .Values.cvat.backend.additionalEnv $localValues.additionalEnv }}
           {{- toYaml . | nindent 10 }}
           {{- end }}
-          {{- if .Values.cvat.backend.worker.readinessProbe.enabled }}
-          readinessProbe:
-            exec:
-              command:
-              - python
-              - manage.py
-              - workerprobe
-              - webhooks
-            {{- toYaml (omit .Values.cvat.backend.worker.readinessProbe "enabled") | nindent 12 }}
-          {{- end }}
+
           {{- if .Values.cvat.backend.worker.livenessProbe.enabled }}
           livenessProbe:
             exec:

diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml
@@ -52,11 +52,6 @@ cvat:
         failureThreshold: 10
         initialDelaySeconds: 60
     worker:
-      readinessProbe:
-        enabled: true
-        periodSeconds: 120
-        initialDelaySeconds: 30
-        timeoutSeconds: 10
       livenessProbe:
         enabled: true
         periodSeconds: 120

diff --git a/tests/python/shared/fixtures/init.py b/tests/python/shared/fixtures/init.py
@@ -240,11 +240,16 @@ def kube_restore_clickhouse_db():
 
 
 def docker_restore_redis_inmem():
-    docker_exec_redis_inmem(["redis-cli", "-e", "flushall"])
+    docker_exec_redis_inmem(["sh", "-c",
+                                    "for p in rq:finished:* rq:job:* rq:wip:* rq:finished:* rq:failed:*; "
+                                    "do redis-cli -e --scan --pattern \"$p\" | xargs -r redis-cli -e del ; done"])
 
 
 def kube_restore_redis_inmem():
-    kube_exec_redis_inmem(["sh", "-c", 'redis-cli -e -a "${REDIS_PASSWORD}" flushall'])
+    kube_exec_redis_inmem(["sh", "-c",
+                                    "for p in rq:finished:* rq:job:* rq:wip:* rq:finished:* rq:failed:*; "
+                                    "do redis-cli -e -a \"${REDIS_PASSWORD}\" --scan --pattern \"$p\" | "
+                                    "xargs -r redis-cli -e -a \"${REDIS_PASSWORD}\" del ; done"])
 
 
 def docker_restore_redis_ondisk():