MLE-24531 Debugging failing DMSDK tests

Also going to move docker-compose to the root dir once this PR is ready.

Author: rjrudin

.copyrightconfig

@@ -11,4 +11,4 @@ startyear: 2015
 #   - Dotfiles already skipped automatically
 # Enable by removing the leading '# ' from the next line and editing values.
 # filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
-filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md
+filesexcluded: .github/*, README.md, Jenkinsfile, package.json, package-lock.json, test-app/*, *.md, docker-compose.yaml

test-app/.env renamed to .env

@@ -7,11 +7,12 @@ tmp
 .settings
 .vscode
 .DS_Store
+
+docker
 test-app/build
 test-app/.gradle
 test-app/gradle-local.properties
 test-app/docker
 test-app/containerLogs
-
 test-complete-app/build
 test-complete-app/.gradle

.gitignore

@@ -21,7 +21,6 @@ instance available for testing.
 
 If you are able to use Docker, run the following:
 
-    cd test-app
     docker-compose up -d --build
 
 This will create a container with the MarkLogic service. The MarkLogic service will take a minute or two to initialize.
@@ -31,6 +30,7 @@ username and password are in the docker-compose.yaml file in the /test-app direc
 Once the container is finished initializing, you need to deploy the test application to the MarkLogic service.
 While still in the test-app directory run the following gradle command.
 
+    cd test-app
     ./gradlew -i mlDeploy
 
 Once the deploy has completed successfully, use "cd .." to return to the root directory of the project.

CONTRIBUTING.md

@@ -16,9 +16,11 @@ def runTests() {
 
 		cd ..
 		rm -rf $WORKSPACE/*.xml || true
-		./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/ --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml -g \'logging|archivePath\' --invert  || true
-		./node_modules/.bin/gulp setupProxyTests || true
-		./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert  || true
+		./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic/documents-data-movement*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-reports.xml || true
+
+		// Turning these off temporarily
+		// ./node_modules/.bin/gulp setupProxyTests || true
+		// ./node_modules/.bin/mocha --timeout 10000 -R xunit test-basic-proxy/lib/**/*.js --reporter mocha-junit-reporter --reporter-options mochaFile=$WORKSPACE/test-basic-proxy-reports.xml -g \'logging|archivePath\' --invert  || true
 	'''
 }
 
@@ -29,7 +31,7 @@ def runDockerCompose(String markLogicDockerImage) {
     sudo /usr/local/sbin/mladmin remove
     docker-compose down -v || true
     sudo /usr/local/sbin/mladmin cleandata
-    cd node-client-api/test-app
+    cd node-client-api
     MARKLOGIC_LOGS_VOLUME=/tmp MARKLOGIC_IMAGE=''' + markLogicDockerImage + ''' docker-compose up -d --build
     sleep 60s;
 	'''
@@ -38,7 +40,7 @@ def runDockerCompose(String markLogicDockerImage) {
 def teardownAfterTests() {
 	updateWorkspacePermissions()
 	sh label: 'teardown-docker', script: '''#!/bin/bash
-    cd node-client-api/test-app
+    cd node-client-api
     docker-compose down -v || true
     '''
 	cleanupDocker()
@@ -118,13 +120,14 @@ pipeline {
 
 	stages {
 
-		stage('runtests-11.3.1') {
+		stage('pull-request-tests') {
 			agent { label 'nodeclientpool' }
 			steps {
 				runAuditReport()
-				runDockerCompose('progressofficial/marklogic-db:latest-11.3')
+				runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
 				runTests()
-				runE2ETests()
+				// Turning these off while debugging
+				// runE2ETests()
 			}
 			post {
 				always {
@@ -136,25 +139,25 @@ pipeline {
 		stage('regressions') {
 			parallel {
 
-				stage('runtests-11-nightly') {
-					when {
-						allOf {
-							branch 'develop'
-							expression { return params.regressions }
-						}
-					}
-					agent { label 'nodeclientpool' }
-					steps {
-						runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11')
-						runTests()
-						runE2ETests()
-					}
-					post {
-						always {
-							teardownAfterTests()
-						}
-					}
-				}
+				// stage('runtests-11-nightly') {
+				// 	when {
+				// 		allOf {
+				// 			branch 'develop'
+				// 			expression { return params.regressions }
+				// 		}
+				// 	}
+				// 	agent { label 'nodeclientpool' }
+				// 	steps {
+				// 		runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11')
+				// 		runTests()
+				// 		runE2ETests()
+				// 	}
+				// 	post {
+				// 		always {
+				// 			teardownAfterTests()
+				// 		}
+				// 	}
+				// }
 
 				stage('runtests-12-nightly') {
 					when {
@@ -176,25 +179,25 @@ pipeline {
 					}
 				}
 
-				stage('runtests-10-nightly') {
-					when {
-						allOf {
-							branch 'develop'
-							expression { return params.regressions }
-						}
-					}
-					agent { label 'nodeclientpool' }
-					steps {
-						runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10')
-						runTests()
-						runE2ETests()
-					}
-					post {
-						always {
-							teardownAfterTests()
-						}
-					}
-				}
+				// stage('runtests-10-nightly') {
+				// 	when {
+				// 		allOf {
+				// 			branch 'develop'
+				// 			expression { return params.regressions }
+				// 		}
+				// 	}
+				// 	agent { label 'nodeclientpool' }
+				// 	steps {
+				// 		runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10')
+				// 		runTests()
+				// 		runE2ETests()
+				// 	}
+				// 	post {
+				// 		always {
+				// 			teardownAfterTests()
+				// 		}
+				// 	}
+				// }
 			}
 		}
 	}