bacpop-25 use gps v6 db

.github/workflows/jestCI.yml

@@ -50,7 +50,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
-        cache-dependency-path: ./app/client/package-lock.json
+        cache-dependency-path: ./app/server/package-lock.json
     - run: npm ci
     - name: get config file
       run: |

app/client/tests/unit/components/SavedProjects.spec.ts

@@ -1,8 +1,8 @@
 /* eslint-disable import/first */
-import EditProjectName from "@/components/projects/EditProjectName.vue";
+import EditProjectName from "@/components/projects/EditProjectName.vue"
 
 const { toLocaleString } = Date.prototype;
-// eslint-disable-next-line no-extend-native
+// eslint-disable-next-line no-extend-native, func-names
 Date.prototype.toLocaleString = function (locale: any = undefined, ...args: any) {
     const options = args[0];
     return toLocaleString.call(this, "en-GB", { ...options, timeZone: "UTC" });

app/server/tests/integration/errors.test.ts

@@ -1,5 +1,6 @@
 import {flushRedis, get, post, saveRedisHash, saveRedisSet} from "./utils";
 import {uid} from "uid";
+import {setTimeout} from "timers/promises";
 import {testSample} from "./testSample";
 
 describe("Error handling", () => {
@@ -43,19 +44,18 @@ describe("Error handling", () => {
         testSample.projectId = projectId;
         const poppunkRes = await post(`poppunk`, testSample, connectionCookie);
         expect(poppunkRes.status).toBe(200);
-        const counter = 0;
+        let counter = 0;
         let finished = false;
         while (!finished && counter < 100) {
-            await new Promise(resolve => {
-                setTimeout(() => {resolve(""), 1000})
-            });
+            await setTimeout(2000);
             const statusRes = await post("status", {hash: testSample.projectHash}, connectionCookie);
             expect(statusRes.status).toBe(200);
             const statusValues = statusRes.data.data;
             if (statusValues.assign === "finished" && statusValues.microreact === "finished" && statusValues.network === "finished") {
                 finished = true;
                 break;
             }
+            counter = counter + 1;
         }
         expect(finished).toBe(true);
         return projectId;

docker-compose.yml

@@ -22,7 +22,7 @@ services:
     environment:
       - REDIS_HOST=beebop-redis
       - STORAGE_LOCATION=./storage
-      - DB_LOCATION=./storage/GPS_v4_references
+      - DB_LOCATION=./storage/GPS_v6_references
   beebop-redis:
     image: redis:5.0
   beebop-py-worker:

scripts/run_dependencies

@@ -2,7 +2,7 @@ NETWORK=beebop_nw
 VOLUME=beebop-storage
 NAME_REDIS=beebop-redis
 NAME_API=beebop-py-api
-API_BRANCH=main
+API_BRANCH=bacpop-25
 NAME_WORKER=beebop-py-worker
 PORT=5000
 
@@ -14,13 +14,13 @@ docker network create $NETWORK > /dev/null || /bin/true
 docker run -d --rm --name $NAME_REDIS --network=$NETWORK -p 6379:6379 redis:5.0
 docker run -d --rm --name $NAME_WORKER --network=$NETWORK \
        --env=REDIS_HOST="$NAME_REDIS" \
+       --pull always \
        -v $VOLUME:/beebop/storage \
        mrcide/beebop-py:$API_BRANCH rqworker
-docker run -d --rm --name $NAME_API --network=$NETWORK \
-       --pull always \
+docker run -d --name $NAME_API --network=$NETWORK \
        --env=REDIS_HOST="$NAME_REDIS" \
        --env=STORAGE_LOCATION="./storage" \
-       --env=DB_LOCATION="./storage/GPS_v4_references" \
+       --env=DB_LOCATION="./storage/GPS_v6_references" \
        -v $VOLUME:/beebop/storage \
        -p $PORT:5000 \
        mrcide/beebop-py:$API_BRANCH