Skip to content

Commit d559021

Browse files
committed
Merge branch 'staging' into ISSUE_5373
2 parents 3c04d1e + 2f370bd commit d559021

File tree

26 files changed

+262
-88
lines changed

26 files changed

+262
-88
lines changed

.azure/build-and-deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ resources:
1717

1818
variables:
1919
# Agent VM image name
20-
vmImageName: 'ubuntu-20.04'
20+
vmImageName: 'ubuntu-24.04'
2121
# Container registry service connection established during pipeline creation
2222
dockerRegistryServiceConnection: '3drepo.azurecr.io'
2323
imageRepository: '3drepo.io'

.azure/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ resources:
1414

1515
variables:
1616
# Agent VM image name
17-
vmImageName: 'ubuntu-20.04'
17+
vmImageName: 'ubuntu-24.04'
1818
# Container registry service connection established during pipeline creation
1919
dockerRegistryServiceConnection: '3drepo.azurecr.io'
2020
imageRepository: '3drepo.io'

.azure/destroy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ trigger: none
22

33
variables:
44
# Agent VM image name
5-
vmImageName: 'ubuntu-20.04'
5+
vmImageName: 'ubuntu-24.04'
66
# Container registry service connection established during pipeline creation
77
dockerRegistryServiceConnection: '3drepo.azurecr.io'
88
imageRepository: '3drepo.io'
@@ -44,4 +44,4 @@ stages:
4444
kubernetesServiceConnection: 'stg3drepo'
4545
namespace: 'default'
4646
command: 'uninstall'
47-
arguments: '$(branchName)'
47+
arguments: '$(branchName)'

.github/workflows/automaticTesting.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414
jobs:
1515
run-backend-tests:
1616
name: Run Backend tests
17-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-24.04
1818
services:
1919
rabbitmq:
2020
image: rabbitmq:3.10.5-management
@@ -51,7 +51,7 @@ jobs:
5151

5252
run-backend-lint:
5353
name: Run Backend lint
54-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-24.04
5555
steps:
5656
- name: Check out Git repository
5757
uses: actions/checkout@v3
@@ -77,7 +77,7 @@ jobs:
7777

7878
run-frontend-tests:
7979
name: Run Frontend tests
80-
runs-on: ubuntu-20.04
80+
runs-on: ubuntu-24.04
8181

8282
steps:
8383
- name: Check out Git repository
@@ -108,7 +108,7 @@ jobs:
108108

109109
run-frontend-lint:
110110
name: Run Frontend lint
111-
runs-on: ubuntu-20.04
111+
runs-on: ubuntu-24.04
112112

113113
steps:
114114
- name: Check out Git repository
@@ -139,7 +139,7 @@ jobs:
139139
# make sure we're not merging DevOps changes
140140
devops-sanity-check:
141141
name: Ensure that custom settings are not being merged
142-
runs-on: ubuntu-20.04
142+
runs-on: ubuntu-24.04
143143
steps:
144144
- name: Checkout .azure/build-and-deploy.yaml
145145
uses: Bhacaz/checkout-files@v2

.travis.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ matrix:
22
include:
33
# tests (v4)
44
- language: node_js
5-
dist: jammy
5+
dist: noble
66
name: Backend tests (V4)
77
git:
88
submodules: false
99
depth: 1
1010
node_js:
11-
- "18.20.4"
11+
- "18.20.6"
1212
sudo: true
1313
addons:
1414
apt:
@@ -23,9 +23,9 @@ matrix:
2323

2424
before_install:
2525
- sudo apt remove mongodb && sudo apt purge mongodb && sudo apt autoremove && sudo rm -rf /var/lib/mongodb
26-
- sudo apt-get -y install gnupg curl
27-
- curl -fsSL https://www.mongodb.org/static/pgp/server-6.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-6.0.gpg --dearmor
28-
- echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-6.0.gpg ] https://repo.mongodb.org/apt/ubuntu jammy/mongodb-org/6.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-6.0.list
26+
- sudo apt-get -y install gnupg curl expect
27+
- curl -fsSL https://www.mongodb.org/static/pgp/server-8.0.asc | sudo gpg -o /usr/share/keyrings/mongodb-server-8.0.gpg --dearmor
28+
- echo "deb [ arch=amd64,arm64 signed-by=/usr/share/keyrings/mongodb-server-8.0.gpg ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-8.0.list
2929
- sudo apt-get update
3030
- sudo apt-get install -y mongodb-org mongodb-org-database mongodb-org-server mongodb-org-mongos mongodb-org-tools
3131
- sudo mkdir -p /var/lib/mongodb

backend/VERSION.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ "VERSION" : "5.14.1",
1+
{ "VERSION" : "5.14.2",
22
"unity" : {
33
"current" : "5.20.0",
44
"supported": []

backend/jest-mongodb-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
module.exports = {
1919
mongodbMemoryServerOptions: {
2020
binary: {
21-
version: '5.0.8',
21+
version: '8.0.4',
2222
skipMD5: true,
2323
downloadDir: './node_modules/.cache',
2424
},

backend/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "3drepo.io",
3-
"version": "5.14.1",
3+
"version": "5.14.2",
44
"engines": {
55
"node": "18.x.x"
66
},

backend/src/v4/response_codes.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,10 @@
416416
*/
417417
responseCodes.respond = function (place, req, res, next, resCode, extraInfo, format, cache, customHeaders) {
418418

419+
// Topology is closed mongo error is typically coming from the session management and the library
420+
// doesn't let us recover from it (so far). So kill this pod and let it respawn.
421+
const killServer = resCode?.name === "MongoError" && resCode?.message?.includes && resCode.message.includes("Topology is closed") ? resCode : false;
422+
419423
resCode = utils.mongoErrorToResCode(resCode);
420424

421425
if (!resCode || valid_values.indexOf(resCode.value) === -1) {
@@ -490,6 +494,10 @@
490494
// log bandwidth and http status code
491495
systemLogger.logInfo(genResponseLogging(resCode, meta, req), undefined, logLabels.network);
492496
}
497+
498+
if (killServer) {
499+
return Promise.reject(killServer);
500+
}
493501
};
494502

495503
responseCodes.writeStreamRespond = function (place, req, res, next, readStream, customHeaders) {

backend/src/v4/routes/apidoc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"version": "5.14.1"
2+
"version": "5.14.2"
33
}

0 commit comments

Comments
 (0)