fixed overrided depends_on (#476)

.github/workflows/old_openzeppelin.yml

@@ -34,6 +34,7 @@ env:
   RUNNER: self-hosted
   IMAGE:  ${{ github.repository_owner }}/neon_tests
   BUILD_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
+  DEVNET_SOLANA_URL: ${{secrets.SOLANA_URL}}
 
 jobs:
   prepare-env:

.github/workflows/openzeppelin.yml

@@ -31,6 +31,7 @@ env:
   CONTAINER:  oz-${{ github.run_id }}
   BUILD_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
   DOCKER_HUB_ORG_NAME: ${{ github.repository_owner }}
+  DEVNET_SOLANA_URL: ${{secrets.SOLANA_URL}}
 jobs:
   dockerize:
     if: github.ref_name != 'develop' || github.event.inputs.oz_tag !=''

deploy/cli/infrastructure.py

@@ -128,7 +128,8 @@ def download_remote_docker_logs():
     ssh_client.load_system_host_keys()
     ssh_client.connect(solana_ip, username="root", key_filename=ssh_key, timeout=120)
 
-    upload_service_logs(ssh_client, "opt_solana_1", artifact_logs)
+    upload_service_logs(ssh_client, "solana", artifact_logs)
+    ssh_client.close()
 
     ssh_client.connect(proxy_ip, username="root", key_filename=ssh_key, timeout=120)
     services = ["postgres", "dbcreation", "indexer", "proxy", "faucet"]

deploy/hetzner/proxy_init.sh

@@ -33,44 +33,42 @@ export PROXY_IMAGE_NAME="neon-proxy.py"
 
 # Generate docker-compose override file
 cat > docker-compose-ci.override.yml <<EOF
-version: "3"
-
 services:
   solana:
     container_name: solana
     healthcheck:
       test: [ CMD-SHELL, "/echo done" ]
     entrypoint: "/usr/bin/sleep 10000"
 
-  gas_tank:
-    container_name: gas_tank
-    entrypoint: "/usr/bin/sleep 10000"
-
-  neon_test_invoke_program_loader:
-    container_name: neon_test_invoke_program_loader
-    command: bash -c "echo done"
-
-services:
   proxy:
     container_name: proxy
     environment:
       SOLANA_URL: $SOLANA_URL
       EXTRA_ARGS: "--num-workers 16"
     ports:
       - "9090:9090"
+    depends_on:
+      solana:
+        condition: service_started
 
   faucet:
     container_name: faucet
     environment:
       SOLANA_URL: $SOLANA_URL
     ports:
       - "3333:3333"
-
+    depends_on:
+      solana:
+        condition: service_started
   indexer:
     container_name: indexer
     environment:
       SOLANA_URL: $SOLANA_URL
-
+    depends_on:
+      solana:
+        condition: service_started
+      dbcreation:
+        condition: service_completed_successfully
   postgres:
     container_name: postgres
 
@@ -79,10 +77,6 @@ services:
 EOF
 
 
-
-# Get list of services
-SERVICES=$(docker-compose -f docker-compose-ci.yml -f docker-compose-ci.override.yml config --services | grep -vP "solana|gas_tank|neon_test_invoke_program_loader")
-
 echo "CONST GAS PRICE VARIABLE IS: $USE_REAL_GAS_PRICE"
 if [[ -n $USE_REAL_GAS_PRICE ]] && [[ $USE_REAL_GAS_PRICE -eq "1" ]]; then
   # remove some variables for economy (test)
@@ -91,7 +85,7 @@ fi
 
 
 # Pull latest versions
-docker-compose -f docker-compose-ci.yml -f docker-compose-ci.override.yml pull $SERVICES
+docker-compose -f docker-compose-ci.yml -f docker-compose-ci.override.yml pull
 
 
 function wait_service() {
@@ -127,7 +121,7 @@ SOLANA_RESULT='"ok"'
 wait_service "solana" $SOLANA_URL $SOLANA_DATA $SOLANA_RESULT
 
 # Up all services
-docker-compose -f docker-compose-ci.yml -f docker-compose-ci.override.yml up -d $SERVICES
+docker-compose -f docker-compose-ci.yml -f docker-compose-ci.override.yml up -d
 
 
 # Check if Proxy is available
@@ -137,4 +131,4 @@ PROXY_RESULT='"result"'
 wait_service "proxy" $PROXY_URL $PROXY_DATA $PROXY_RESULT
 
 
-docker rm -f opt_solana_1
+docker rm -f solana

deploy/hetzner/solana_init.sh

@@ -51,6 +51,7 @@ cat > docker-compose-ci.override.yml<<EOF
 version: "3"
 services:
   solana:
+    container_name: solana
     environment:
       DEVNET_SOLANA_URL: $DEVNET_SOLANA_URL
     ports: