Use docker.io images

arangodb · Sep 27, 2022 · 3a302b3 · 3a302b3
1 parent 400015a
commit 3a302b3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/.github/workflows/resilience.yml b/.github/workflows/resilience.yml
@@ -14,7 +14,10 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [14, 16, 18]
-        arangodb-version: [3.8, 3.9]
+        arangodb-version:
+          - docker.io/arangodb/arangodb:3.8
+          - docker.io/arangodb/arangodb:3.9
+          - docker.io/arangodb/arangodb-preview:3.10-nightly
 
     steps:
       - uses: actions/checkout@v2
@@ -23,9 +26,9 @@ jobs:
           node-version: ${{ matrix.node-version }}
       - run: npm install -g npm@8
       - run: npm install
-      - run: docker pull arangodb:${{ matrix.arangodb-version }}
+      - run: docker pull ${{ matrix.arangodb-version }}
       - run: npm test
         env:
           ARANGO_RELEASE: ${{ matrix.arangodb-version }}
-          RESILIENCE_DOCKER_IMAGE: arangodb:${{ matrix.arangodb-version }}
+          RESILIENCE_DOCKER_IMAGE: ${{ matrix.arangodb-version }}
           CI: true
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -13,14 +13,17 @@ jobs:
       fail-fast: false
       matrix:
         node-version: [14, 16, 18]
-        arangodb-version: [3.8, 3.9]
+        arangodb-version:
+          - docker.io/arangodb/arangodb:3.8
+          - docker.io/arangodb/arangodb:3.9
+          - docker.io/arangodb/arangodb-preview:3.10-nightly
 
     container:
       image: node:${{ matrix.node-version }}
 
     services:
       arangodb:
-        image: arangodb:${{ matrix.arangodb-version }}
+        image: ${{ matrix.arangodb-version }}
         env:
           ARANGO_NO_AUTH: 1
 
@@ -40,14 +43,17 @@ jobs:
 
     strategy:
       matrix:
-        arangodb-version: [3.8, 3.9]
+        arangodb-version:
+          - docker.io/arangodb/arangodb:3.8
+          - docker.io/arangodb/arangodb:3.9
+          - docker.io/arangodb/arangodb-preview:3.10-nightly
 
     container:
       image: node:16
 
     services:
       arangodb:
-        image: arangodb:${{ matrix.arangodb-version }}
+        image: ${{ matrix.arangodb-version }}
         env:
           ARANGO_NO_AUTH: 1
 

diff --git a/src/test/_config.ts b/src/test/_config.ts
@@ -8,7 +8,10 @@ const ARANGO_RELEASE = process.env.ARANGO_RELEASE || "";
 let arangoVersion: number = 39999;
 if (ARANGO_VERSION) arangoVersion = ARANGO_VERSION;
 else if (ARANGO_RELEASE.includes(".")) {
-  const [major, minor] = ARANGO_RELEASE.split(".").map((v) => Number(v));
+  let release = ARANGO_RELEASE;
+  if (release.includes(":")) release = release.split(":").at(-1)!;
+  if (release.includes("-")) release = release.split(":")[0];
+  const [major, minor] = release.split(".").map((v) => Number(v));
   arangoVersion = (major * 100 + minor) * 100;
 }
 const ARANGO_LOAD_BALANCING_STRATEGY = process.env