Merge pull request #40 from marklogic/feature/CLD-613

CLD-613: Move test results folder to proper location, fix typo

Author: ilanRosenbaum

Jenkinsfile

@@ -107,9 +107,9 @@ void resultNotification(message) {
     if (JIRA_ID) {
         def comment = [ body: "Jenkins pipeline build result: ${message}" ]
         jiraAddComment site: 'JIRA', idOrKey: JIRA_ID, failOnError: false, input: comment
-        mail charset: 'UTF-8', mimeType: 'text/html', to: "${emailList}", body: "${jira_email_body}", subject: "${message}: ${env.JOB_NAME} #${env.BUILD_NUMBER}"
+        mail charset: 'UTF-8', mimeType: 'text/html', to: "${emailList}", body: "${jira_email_body}", subject: "${message}: ${env.JOB_NAME} #${env.BUILD_NUMBER} - ${JIRA_ID}"
     } else {
-        mail charset: 'UTF-8', mimeType: 'text/html', to: "${emailList}", body: "${email_body}", subject: "${message}: ${env.JOB_NAME} #${env.BUILD_NUMBER} - ${JIRA_ID}"
+        mail charset: 'UTF-8', mimeType: 'text/html', to: "${emailList}", body: "${email_body}", subject: "${message}: ${env.JOB_NAME} #${env.BUILD_NUMBER}"
     }
 }
 

makefile

@@ -90,7 +90,7 @@ e2e-test: prepare
 	minikube image load $(dockerImage)
 
 	@echo "=====Running e2e tests"
-	$(if $(saveOutput),gotestsum --junitfile test_results/e2e-tests.xml ./test/e2e/... -count=1 -timeout 30m, go test -v -count=1 ./test/e2e/...) 
+	$(if $(saveOutput),gotestsum --junitfile test/test_results/e2e-tests.xml ./test/e2e/... -count=1 -timeout 30m, go test -v -count=1 ./test/e2e/...) 
 
 	@echo "=====Delete minikube cluster"
 	minikube delete
@@ -103,7 +103,7 @@ e2e-test: prepare
 .PHONY: template-test
 template-test: prepare
 	@echo "=====Running template tests"
-	$(if $(saveOutput),gotestsum --junitfile test_results/testplate-tests.xml ./test/template/... -count=1, go test -v -count=1 ./test/template/...) 
+	$(if $(saveOutput),gotestsum --junitfile test/test_results/testplate-tests.xml ./test/template/... -count=1, go test -v -count=1 ./test/template/...) 
 
 #***************************************************************************
 # test