Skip to content

Commit a8b6451

Browse files
rjrudinrjrudin
committed
MLE-24531 Added editorconfig
And formatted Jenkinsfile with it. It's our standard editorconfig with some Copilot recommendations added for a Node project.
1 parent 730ff79 commit a8b6451

File tree

2 files changed

+136
-114
lines changed

2 files changed

+136
-114
lines changed

‎.editorconfig‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# http://editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 2
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[*.md]
13+
trim_trailing_whitespace = false
14+
15+
[*.{json,yml,yaml}]
16+
indent_size = 2
17+
18+
[*.{js,ts}]
19+
indent_size = 2
20+
21+
[*.java]
22+
indent_size = 4

‎Jenkinsfile‎

Lines changed: 114 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@Library('shared-libraries') _
22

33
def runTests() {
4-
sh label: 'deploy-test-app-and-run-tests', script: '''
4+
sh label: 'deploy-test-app-and-run-tests', script: '''
55
export JAVA_HOME=$JAVA_HOME_DIR
66
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
77
export PATH=$JAVA_HOME/bin:$GRADLE_USER_HOME:${NODE_HOME_DIR}/bin:$PATH
@@ -23,8 +23,8 @@ def runTests() {
2323
}
2424

2525
def runDockerCompose(String markLogicDockerImage) {
26-
cleanupDocker()
27-
sh label: 'run-docker-compose', script: '''#!/bin/bash
26+
cleanupDocker()
27+
sh label: 'run-docker-compose', script: '''#!/bin/bash
2828
echo "Removing any running MarkLogic server and clean up MarkLogic data directory"
2929
sudo /usr/local/sbin/mladmin remove
3030
docker-compose down -v || true
@@ -38,16 +38,16 @@ def runDockerCompose(String markLogicDockerImage) {
3838
}
3939

4040
def teardownAfterTests() {
41-
updateWorkspacePermissions()
42-
sh label: 'teardown-docker', script: '''#!/bin/bash
41+
updateWorkspacePermissions()
42+
sh label: 'teardown-docker', script: '''#!/bin/bash
4343
cd node-client-api
4444
docker-compose down -v || true
4545
'''
46-
cleanupDocker()
46+
cleanupDocker()
4747
}
4848

4949
def runAuditReport() {
50-
sh label: 'run-audit-report', script: '''
50+
sh label: 'run-audit-report', script: '''
5151
export PATH=${NODE_HOME_DIR}/bin:$PATH
5252
cd node-client-api
5353
npm ci
@@ -57,7 +57,7 @@ def runAuditReport() {
5757
}
5858

5959
def runE2ETests() {
60-
sh label: 'run-e2e-tests', script: '''
60+
sh label: 'run-e2e-tests', script: '''
6161
export PATH=${NODE_HOME_DIR}/bin:$PATH
6262
cd node-client-api
6363
node --version
@@ -91,113 +91,113 @@ def runE2ETests() {
9191
../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-transactions.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-transactions-results.js.xml || true
9292
../node_modules/.bin/mocha -R xunit --timeout 60000 -R xunit "nodejs-ds-dynamic.js" --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/ds-dynamic-results.xml || true
9393
'''
94-
junit '**/*.xml'
94+
junit '**/*.xml'
9595
}
9696

9797
pipeline {
98-
agent none
99-
100-
triggers {
101-
parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "")
102-
}
103-
104-
parameters {
105-
booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions')
106-
}
107-
108-
options {
109-
checkoutToSubdirectory 'node-client-api'
110-
buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10')
111-
}
112-
113-
environment {
114-
NODE_HOME_DIR = "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64"
115-
DMC_USER = credentials('MLBUILD_USER')
116-
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
117-
GRADLE_DIR = ".gradle"
118-
JAVA_HOME_DIR = "/home/builder/java/jdk-17.0.2"
119-
}
120-
121-
stages {
122-
123-
stage('pull-request-tests') {
124-
agent { label 'nodeclientpool' }
125-
steps {
126-
runAuditReport()
127-
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
128-
runTests()
129-
runE2ETests()
130-
}
131-
post {
132-
always {
133-
teardownAfterTests()
134-
}
135-
}
136-
}
137-
138-
stage('regressions') {
139-
parallel {
140-
141-
stage('runtests-11-nightly') {
142-
when {
143-
allOf {
144-
branch 'develop'
145-
expression { return params.regressions }
146-
}
147-
}
148-
agent { label 'nodeclientpool' }
149-
steps {
150-
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11')
151-
runTests()
152-
runE2ETests()
153-
}
154-
post {
155-
always {
156-
teardownAfterTests()
157-
}
158-
}
159-
}
160-
161-
stage('runtests-12-nightly') {
162-
when {
163-
allOf {
164-
branch 'develop'
165-
expression { return params.regressions }
166-
}
167-
}
168-
agent { label 'nodeclientpool' }
169-
steps {
170-
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
171-
runTests()
172-
runE2ETests()
173-
}
174-
post {
175-
always {
176-
teardownAfterTests()
177-
}
178-
}
179-
}
180-
181-
stage('runtests-10-nightly') {
182-
when {
183-
allOf {
184-
branch 'develop'
185-
expression { return params.regressions }
186-
}
187-
}
188-
agent { label 'nodeclientpool' }
189-
steps {
190-
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10')
191-
runTests()
192-
runE2ETests()
193-
}
194-
post {
195-
always {
196-
teardownAfterTests()
197-
}
198-
}
199-
}
200-
}
201-
}
202-
}
98+
agent none
99+
100+
triggers {
101+
parameterizedCron(env.BRANCH_NAME == "develop" ? "00 02 * * * % regressions=true" : "")
102+
}
103+
104+
parameters {
105+
booleanParam(name: 'regressions', defaultValue: false, description: 'indicator if build is for regressions')
106+
}
107+
108+
options {
109+
checkoutToSubdirectory 'node-client-api'
110+
buildDiscarder logRotator(artifactDaysToKeepStr: '7', artifactNumToKeepStr: '', daysToKeepStr: '7', numToKeepStr: '10')
111+
}
112+
113+
environment {
114+
NODE_HOME_DIR = "/users/ml/builder/nodeJs/node-v22.20.0-linux-x64"
115+
DMC_USER = credentials('MLBUILD_USER')
116+
DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
117+
GRADLE_DIR = ".gradle"
118+
JAVA_HOME_DIR = "/home/builder/java/jdk-17.0.2"
119+
}
120+
121+
stages {
122+
123+
stage('pull-request-tests') {
124+
agent { label 'nodeclientpool' }
125+
steps {
126+
runAuditReport()
127+
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
128+
runTests()
129+
runE2ETests()
130+
}
131+
post {
132+
always {
133+
teardownAfterTests()
134+
}
135+
}
136+
}
137+
138+
stage('regressions') {
139+
parallel {
140+
141+
stage('runtests-11-nightly') {
142+
when {
143+
allOf {
144+
branch 'develop'
145+
expression { return params.regressions }
146+
}
147+
}
148+
agent { label 'nodeclientpool' }
149+
steps {
150+
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11')
151+
runTests()
152+
runE2ETests()
153+
}
154+
post {
155+
always {
156+
teardownAfterTests()
157+
}
158+
}
159+
}
160+
161+
stage('runtests-12-nightly') {
162+
when {
163+
allOf {
164+
branch 'develop'
165+
expression { return params.regressions }
166+
}
167+
}
168+
agent { label 'nodeclientpool' }
169+
steps {
170+
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
171+
runTests()
172+
runE2ETests()
173+
}
174+
post {
175+
always {
176+
teardownAfterTests()
177+
}
178+
}
179+
}
180+
181+
stage('runtests-10-nightly') {
182+
when {
183+
allOf {
184+
branch 'develop'
185+
expression { return params.regressions }
186+
}
187+
}
188+
agent { label 'nodeclientpool' }
189+
steps {
190+
runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10')
191+
runTests()
192+
runE2ETests()
193+
}
194+
post {
195+
always {
196+
teardownAfterTests()
197+
}
198+
}
199+
}
200+
}
201+
}
202+
}
203203
}

0 commit comments

Comments
 (0)