Making more changes to use Jenkinsfile

Trying to do baby steps to keep things working

Author: rjrudin

Jenkinsfile

@@ -1,8 +1,6 @@
 @Library('shared-libraries') _
 
-def runTests(String type,String version){
-    copyRPM type,version
-    setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
+def runTests(){
     sh '''
         export JAVA_HOME=$JAVA_HOME_DIR
         export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
@@ -11,8 +9,11 @@ def runTests(String type,String version){
         node --version
         npm --version
         npm ci
+
         cd test-app
-        ./gradlew -i mlDeploy -g $PWD
+        ./gradlew -i mlTestConnections
+        ./gradlew -i mlDeploy
+        
         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
@@ -35,28 +36,6 @@ def runDockerCompose(String markLogicDockerImage) {
     '''
 }
 
-def runDockerTests() {
-  sh label:'deploy ml-gradle test application', script: '''#!/bin/bash
-    export JAVA_HOME=$JAVA17_HOME_DIR
-    export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
-    export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH:${NODE_HOME_DIR}/bin:$PATH
-
-    cd node-client-api/test-app
-    ./gradlew -i mlTestConnections
-    ./gradlew -i mlDeploy
-
-    cd ..
-    node --version
-    npm --version
-    npm ci
-    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
-  '''
-}
-
 def teardownAfterTests() {
     updateWorkspacePermissions()
     sh label:'mlcleanup', script: '''#!/bin/bash
@@ -76,9 +55,7 @@ def runAuditReport(){
     '''
 }
 
-def runE2ETests(String type,String version){
-    copyRPM type,version
-    setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
+def runE2ETests(){
     sh '''
         export PATH=${NODE_HOME_DIR}/bin:$PATH
         cd node-client-api
@@ -145,9 +122,8 @@ pipeline{
             steps{
                 runAuditReport()
                 runDockerCompose('progressofficial/marklogic-db:latest-11.3')
-                runDockerTests()
-                // runTests('Release','11.3.1')
-                // runE2ETests('Release','11.3.1')
+                runTests()
+                runE2ETests()
             }
             post{
                 always{
@@ -166,8 +142,14 @@ pipeline{
                         }
                     agent {label 'nodeclientpool'}
                     steps{
-                        runTests('Latest','11')
-                        runE2ETests('Latest','11')
+                        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'){
@@ -179,8 +161,14 @@ pipeline{
                         }
                     agent {label 'nodeclientpool'}
                     steps{
-                        runTests('Latest','12.0')
-                        runE2ETests('Latest','12.0')
+                        runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12')
+                        runTests()
+                        runE2ETests()
+                    }
+                    post{
+                        always{
+                            teardownAfterTests()
+                        }
                     }
                 }
                 stage('runtests-10-nightly'){
@@ -192,21 +180,14 @@ pipeline{
                         }
                     agent {label 'nodeclientpool'}
                     steps{
-                        runTests('Latest','10.0')
-                        runE2ETests('Latest','10.0')
+                        runDockerCompose('ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-10')
+                        runTests()
+                        runE2ETests()
                     }
-                }
-                stage('runtests-10.0-10.2'){
-                    when{
-                        allOf{
-                            branch 'develop'
-                                expression {return params.regressions}
-                            }
+                    post{
+                        always{
+                            teardownAfterTests()
                         }
-                    agent {label 'nodeclientpool'}
-                    steps{
-                        runTests('Release','10.0-10.2')
-                        runE2ETests('Release','10.0-10.2')
                     }
                 }
             }

package-lock.json

@@ -99,7 +99,7 @@
     "serialize-javascript": "6.0.2",
     "supports-color": "7.2.0",
     "strip-ansi": "6.0.0",
-    "tar-fs": "2.1.3",
+    "tar-fs": "2.1.4",
     "tmp": "0.2.4",
     "wrap-ansi": "6.2.0"
   }