Skip to content

Commit 11266b7

Browse files
authored
Merge pull request #462 from UoA-eResearch/rc2.8.12
Rc2.8.12
2 parents 9826474 + 76d7c33 commit 11266b7

24 files changed

Lines changed: 18570 additions & 33054 deletions

File tree

Jenkinsfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pipeline {
1313
}
1414

1515
agent {
16-
label("uoa-buildtools-ionic")
16+
label("uoa-buildtools-node20")
1717
}
1818

1919
options {
@@ -288,7 +288,7 @@ pipeline {
288288
steps {
289289
echo 'Installing research-hub-web dependencies.'
290290
dir("research-hub-web") {
291-
sh "npm install"
291+
sh "npm install --force"
292292
sh "mkdir -p ${HOME}/research-hub-web/"
293293
// sh "tar cvfz ./node_modules.tar.gz node_modules" // Cache new node_modules/ folder
294294
// script {
@@ -345,10 +345,10 @@ pipeline {
345345
echo 'Running research-hub-web unit tests'
346346
sh 'npm run test-ci'
347347

348-
echo 'Running research-hub-web e2e tests'
348+
// echo 'Running research-hub-web e2e tests'
349349
// set the graphql server url as an env variable for Cypress
350350
// for intercepting some of the graphql queries and returning mocked data
351-
sh "export cypress_graphql_server=${graphqlServer} && npm run e2e-ci"
351+
// sh "export cypress_graphql_server=${graphqlServer} && npm run e2e-ci"
352352
}
353353
}
354354
}

0 commit comments

Comments
 (0)