Skip to content

Commit 0c36e94

Browse files
committed
MLE-24685 Fixing test-complete-app deploy
Jenkins is getting an issue resolving 4.7.0 ml-gradle, so shifting to 6.0.1 - which is fine to use here because we don't need ml-gradle for deploying any LSQT stuff.
1 parent acb4660 commit 0c36e94

File tree

8 files changed

+297
-203
lines changed

8 files changed

+297
-203
lines changed

.copyrightconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ startyear: 2015
1111
# - Dotfiles already skipped automatically
1212
# Enable by removing the leading '# ' from the next line and editing values.
1313
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
14-
filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml
14+
filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml, test-complete-app/*

Jenkinsfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ def runTests() {
44
sh label: 'deploy-test-app-and-run-tests', script: '''
55
export JAVA_HOME=$JAVA_HOME_DIR
66
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
7-
export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:${NODE_HOME_DIR}/bin:$PATH
7+
export PATH=$JAVA_HOME/bin:${NODE_HOME_DIR}/bin:$PATH
88
cd node-client-api
99
node --version
1010
npm --version
@@ -58,7 +58,9 @@ def runAuditReport() {
5858

5959
def runE2ETests() {
6060
sh label: 'run-e2e-tests', script: '''
61-
export PATH=${NODE_HOME_DIR}/bin:$PATH
61+
export JAVA_HOME=$JAVA_HOME_DIR
62+
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
63+
export PATH=$JAVA_HOME/bin:${NODE_HOME_DIR}/bin:$PATH
6264
cd node-client-api
6365
node --version
6466
npm --version

test-complete-app/build.gradle

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1+
/**
2+
* This Gradle file is used to add a certificate template to the app that is created via the bespoke
3+
* deployer in test-setup-qa.js and test-setup-dmsdk-qa.js.
4+
*/
15
plugins {
26
id "net.saliman.properties" version "1.5.1"
3-
id "com.marklogic.ml-gradle" version "4.7.0"
7+
id "com.marklogic.ml-gradle" version "6.0.1"
48
}
59

610
/*
@@ -13,4 +17,4 @@ ext {
1317
command.setCommonName("localhost")
1418
command.setValidFor(365)
1519
mlAppDeployer.commands.add(command)
16-
}
20+
}
2.9 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)