Switching back to rpm

And undoing a couple test changes that didn't seem to help.

Author: rjrudin

Jenkinsfile

@@ -1,6 +1,8 @@
 @Library('shared-libraries') _
 
-def runTests() {
+def runTests(String type,String version) {
+  copyRPM type,version
+  setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
   sh label: 'deploy-test-app-and-run-tests', script: '''
 		export JAVA_HOME=$JAVA_HOME_DIR
 		export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -38,12 +40,12 @@ def runDockerCompose(String markLogicDockerImage) {
 }
 
 def teardownAfterTests() {
-  updateWorkspacePermissions()
-  sh label: 'teardown-docker', script: '''#!/bin/bash
-    cd node-client-api
-    docker-compose down -v || true
-    '''
-  cleanupDocker()
+//  updateWorkspacePermissions()
+//  sh label: 'teardown-docker', script: '''#!/bin/bash
+//    cd node-client-api
+//    docker-compose down -v || true
+//    '''
+//  cleanupDocker()
 }
 
 def runAuditReport() {
@@ -56,7 +58,9 @@ def runAuditReport() {
 	'''
 }
 
-def runE2ETests() {
+def runE2ETests(String type,String version) {
+  copyRPM type,version
+  setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
   sh label: 'run-e2e-tests', script: '''
 		export PATH=${NODE_HOME_DIR}/bin:$PATH
 		cd node-client-api
@@ -124,14 +128,8 @@ pipeline {
       agent { label 'nodeclientpool' }
       steps {
         runAuditReport()
-        runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
-        runTests()
-        runE2ETests()
-      }
-      post {
-        always {
-          teardownAfterTests()
-        }
+        runTests('Latest','12.1')
+        runE2ETests('Latest','12.1')
       }
     }
 
@@ -147,9 +145,8 @@ pipeline {
           }
           agent { label 'nodeclientpool' }
           steps {
-            runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-11')
-            runTests()
-            runE2ETests()
+            runTests('Latest','11')
+            runE2ETests('Latest','11')
           }
           post {
             always {
@@ -167,9 +164,8 @@ pipeline {
           }
           agent { label 'nodeclientpool' }
           steps {
-            runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
-            runTests()
-            runE2ETests()
+            runTests('Latest','12')
+            runE2ETests('Latest','12')
           }
           post {
             always {
@@ -187,9 +183,8 @@ pipeline {
           }
           agent { label 'nodeclientpool' }
           steps {
-            runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10')
-            runTests()
-            runE2ETests()
+            runTests('Latest','10')
+            runE2ETests('Latest','10')
           }
           post {
             always {

test-complete/nodejs-dmsdk-queryToTransformAll.js

@@ -124,11 +124,14 @@ describe('data movement transformAll', function () {
             transform: [transformName, { newValue: 'transformedValue' }],
             batchSize: 10,
             onBatchSuccess: (function (progress, documents) {
-                // Don't call done() here - onBatchSuccess is called multiple times
-                // Let onCompletion handle calling done()
-                progress.docsTransformedSuccessfully.should.be.greaterThanOrEqual(10);
-                progress.docsFailedToBeTransformed.should.be.equal(0);
-                progress.timeElapsed.should.be.greaterThanOrEqual(0);
+                try {
+                    progress.docsTransformedSuccessfully.should.be.greaterThanOrEqual(10);
+                    progress.docsFailedToBeTransformed.should.be.equal(0);
+                    progress.timeElapsed.should.be.greaterThanOrEqual(0);
+                } catch (err) {
+                    done(err);
+                }
+
             }),
             onCompletion: ((summary) => {
                 try {

test-complete/nodejs-dmsdk-removeAllUris.js

@@ -38,13 +38,9 @@ describe('Functional tests - data movement removeAllUris', function () {
 
         dbWriter.documents.writeAll(readable, {
             onCompletion: ((summary) => {
-                if (summary.error) {
-                    done(new Error('Setup failed: ' + summary.error));
-                } else {
-                    done();
-                }
+                done();
             })
-        }).catch(done);
+        });
 
     });