Rework processes (#9322)

Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Andrey Sobolev <haiodo@gmail.com>

tests/create-local.sh

@@ -6,9 +6,7 @@
 ./tool-local.sh create-workspace sanity-ws email:user1 -r cockroach
 
 # Restore workspace contents in mongo/elastic
-./tool-local.sh backup-restore ./sanity-ws sanity-ws
-
-./tool-local.sh upgrade-workspace sanity-ws
+./tool-local.sh backup-restore ./sanity-ws sanity-ws --upgrade
 
 ./tool-local.sh assign-workspace user1 sanity-ws
 ./tool-local.sh assign-workspace user2 sanity-ws

tests/docker-compose.yaml

@@ -89,7 +89,7 @@ services:
       - 9002:9000
       - 9003:9001
     healthcheck:
-      test: ["CMD", "mc", "ready", "local"]
+      test: ['CMD', 'mc', 'ready', 'local']
       interval: 5s
       retries: 10
   elastic:
@@ -137,6 +137,9 @@ services:
       - cockroach
       - minio
       - redpanda
+    depends_on:
+      redpanda:
+        condition: service_started
     volumes:
       - ./branding-test.json:/var/cfg/branding.json
     environment:
@@ -186,6 +189,9 @@ services:
   transactor:
     image: hardcoreeng/transactor
     pull_policy: never
+    depends_on:
+      redpanda:
+        condition: service_started
     links:
       - mongodb
       - elastic
@@ -245,6 +251,11 @@ services:
   fulltext:
     image: hardcoreeng/fulltext
     restart: unless-stopped
+    depends_on:
+      redpanda:
+        condition: service_started
+      cockroach:
+        condition: service_started
     links:
       - elastic
       - mongodb

tests/restore-local.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
 # Restore workspace contents in mongo/elastic
-./tool-local.sh backup-restore ./sanity-ws sanity-ws
-
-./tool-local.sh upgrade-workspace sanity-ws --indexes
+./tool-local.sh backup-restore ./sanity-ws sanity-ws --upgrade
 
 # Re-assign user to workspace.
 ./tool-local.sh assign-workspace user1 sanity-ws

tests/restore-pg.sh

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 
 # Restore workspace contents in mongo/elastic
-./tool-pg.sh backup-restore ./sanity-ws sanity-ws
+./tool-pg.sh backup-restore ./sanity-ws sanity-ws --upgrade
 
-./tool-pg.sh upgrade-workspace sanity-ws
+# ./tool-pg.sh upgrade-workspace sanity-ws
 
 # Re-assign user to workspace.
 ./tool-pg.sh assign-workspace user1 sanity-ws

tests/restore-workspace.sh

@@ -1,9 +1,7 @@
 #!/usr/bin/env bash
 
 # Restore workspace contents in mongo/elastic
-./tool.sh backup-restore ./sanity-ws sanity-ws
-
-./tool.sh upgrade-workspace sanity-ws --indexes --force
+./tool.sh backup-restore ./sanity-ws sanity-ws --upgrade
 
 # Re-assign user to workspace.
 ./tool.sh assign-workspace user1 sanity-ws