updated the parameters used , attachvolume and installdependencies are handled via seperate shared libraries

Author: nagalakshmi

Jenkinsfile

@@ -30,7 +30,7 @@ def setupDockerMarkLogic(String image) {
         sudo /usr/local/sbin/mladmin cleandata
         cd java-client-api
 		export PLATFORM=$PLATFORM
-		export SET_CONVERTERS=$SET_CONVERTERS
+		export MARKLOGIC_INSTALL_CONVERTERS=$MARKLOGIC_INSTALL_CONVERTERS
         docker compose down -v || true
         docker volume prune -f
 
@@ -40,7 +40,6 @@ def setupDockerMarkLogic(String image) {
         MARKLOGIC_IMAGE=''' + image + ''' MARKLOGIC_LOGS_VOLUME=marklogicLogs \
         docker compose up -d --build
 		echo "Waiting for MarkLogic server to initialize."
-        sleep 60
         export JAVA_HOME=$JAVA_HOME_DIR
         export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
         export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
@@ -203,7 +202,7 @@ pipeline {
 		DMC_USER = credentials('MLBUILD_USER')
 		DMC_PASSWORD = credentials('MLBUILD_PASSWORD')
 		PLATFORM = getPlatform()
-		SET_CONVERTERS = setConverters()
+		MARKLOGIC_INSTALL_CONVERTERS = setConverters()
 	}
 
 	stages {
@@ -332,28 +331,38 @@ pipeline {
 					env.DEPLOYMENT_REGION = deploymentResult.region
 					env.DEPLOYMENT_TERRAFORM_DIR = deploymentResult.terraformDir
 					env.EC2_PRIVATE_IP = deploymentResult.privateIp
-
+					
 					def nodeName = "java-client-agent-${BUILD_NUMBER}"
                     def remoteFS = "/space/jenkins_home"
                     def labels = "java-client-agent-${BUILD_NUMBER}"
                     def instanceIp = env.EC2_PRIVATE_IP
-
-					// Use shared library for volume attachment
+        
+                    // Attach volumes
                     def volumeResult = attachInstanceVolumes([
                         instanceIp: instanceIp,
                         remoteFS: remoteFS,
-                        packageFile: params.packagefile,
-                        setupScriptPath: 'terraform-templates/arm-server-build/setup_volume.sh',
-                        packageDir: 'terraform-templates/java-client-api',
-                        initScriptsDir: 'terraform-templates/java-client-api/scripts',
-						initScriptsFile: 'terraform-templates/java-client-api/initscripts',
                         branch: params.terraformBranch
-
                     ])
 
                     echo "✅ Volume attachment completed: ${volumeResult.volumeAttached}"
                     echo "✅ Java installed: ${volumeResult.javaInstalled}"
-                    echo "✅ Dependencies installed: ${volumeResult.dependenciesInstalled}"
+                    echo "✅ Terraform branch used: ${volumeResult.terraformBranch}"
+        
+                    //Install dependencies AND run init scripts
+                    def depsResult = installDependenciesAndInitScripts([
+                        instanceIp: instanceIp,
+                        packageFile: params.packagefile,
+                        packageDir: 'terraform-templates/java-client-api',
+                        initScriptsDir: 'terraform-templates/java-client-api/scripts',
+                        initScriptsFile: 'terraform-templates/java-client-api/initscripts'
+                    ])
+                    
+                    echo "✅ Dependencies installed: ${depsResult.dependenciesInstalled}"
+                    if (depsResult.initScriptsExecuted) {
+                        echo "✅ Init scripts executed: ${depsResult.initScriptsCount} scripts"
+                    } else {
+                        echo "ℹ️ No init scripts configured or executed"
+                    }
 
 					// Use shared library to create Jenkins agent
                     def agentResult = createJenkinsAgent([

docker-compose.yaml

@@ -6,7 +6,7 @@ services:
     image: "${MARKLOGIC_IMAGE}"
     platform: "${PLATFORM:-linux/amd64}"
     environment:
-      - INSTALL_CONVERTERS=${SET_CONVERTERS:-true}
+      - INSTALL_CONVERTERS=${MARKLOGIC_INSTALL_CONVERTERS:-true}
       - MARKLOGIC_INIT=true
       - MARKLOGIC_ADMIN_USERNAME=admin
       - MARKLOGIC_ADMIN_PASSWORD=admin