Setting up config

arangodb · Oct 13, 2023 · cc0bfdd · cc0bfdd
1 parent 9077e57
commit cc0bfdd
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 16 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,35 +16,35 @@ jobs:
     docker:
       - image: python:<< parameters.python-version >>
         name: driver
+        command:
+          - "python -m http.server"
       - image: arangodb/<< parameters.arangodb-version >>
         name: db
+        environment:
+          ARANGODB_CONF: << parameters.arangodb-config >>
         command:
           - "/bin/sh"
           - "-c"
           - >
-            export ARANGODB_CONF=<< parameters.arangodb-config >> &&
-            wget -O - https://raw.githubusercontent.com/ArangoDB-Community/python-arango/main/tests/static/setup.sh |
+            wget --quiet --waitretry=1 --tries=60 -O - http://driver:8000/tests/static/setup.sh |
             /bin/sh
     steps:
       - checkout
-      - run:
-          name: "Wait for ArangoDB starter"
-          command: |
-            url="http://db:8528/version"
-            for _ in {1..30}; do
-              if curl --output /dev/null --silent "$url"; then
-                echo "starter ready!"
-                exit 0
-              fi
-              echo "url not available, retrying..."
-              sleep 1
-            done
-            echo "starter not ready, giving up"
-            exit 1
       - run:
           name: "Install Dependencies"
           command: |
             pip install -e .[dev]
+      - run:
+          name: "Wait for ArangoDB starter"
+          command: |
+            wget --quite --waitretry=1 --tries=120 -O - http://db:8528/version
+            if [ $? -eq 0 ]; then
+              echo "starter ready"
+              exit 0
+            else
+              echo "starter not ready, giving up"
+              exit 1
+            fi
       - run:
           name: "Run Tests"
           command: |

diff --git a/tests/static/setup.sh b/tests/static/setup.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+mkdir -p /tests/static
+wget -O /tests/static/service.zip "https://raw.githubusercontent.com/ArangoDB-Community/python-arango/main/tests/static/service.zip"
+wget -O /tests/static/keyfile "https://raw.githubusercontent.com/ArangoDB-Community/python-arango/main/tests/static/keyfile"
+wget -O /tests/static/arangodb.conf "https://raw.githubusercontent.com/ArangoDB-Community/python-arango/main/tests/static/$ARANGODB_CONF"
+arangodb --configuration=/tests/static/arangodb.conf