Merge pull request #761 from sf-pallavi-das/u/pallavi-das/W-19887188_Updating_wait_time_master

@W-19887188 Changing wait time for mdapi:deploy command

Author: sf-pranav-varshney

README.md

@@ -810,6 +810,7 @@ The Job file additionally supports some Vlocity Build based options and the opti
 | useAllRelationships | Determines whether or not to store the _AllRelations.json file which may not generate consistently enough for Version Control. Recommended to set to false. | Boolean | true |
 | useVlocityTriggers | Turn on / off Vlocity's AllTriggers Custom Setting during the Deploy | Boolean |true |
 | disableVlocityTriggers | Turn off Vlocity's AllTriggers Custom Setting during the Deploy | Boolean |false |
+| wait | Wait time in minutes for SFDX/SF CLI deployment commands. Used with useSfdxCli option. Note: Infinite wait time(-1) is not supported by SFDX anymore, so a specific wait time must be provided. | Integer | 33 |
 | ignoreLWCActivationOS | Do not compile and deploy LWC OmniScripts | Boolean |false |
 | ignoreLWCActivationCards | Do not compile and deploy LWC Cards | Boolean |false |
 | lwcCompilerNamespace | Overrides the namespace of the installed managed package. Useful when using a developer org. Options: vlocity-cme, vlocity-ins, vlocity-ps | String | - |
@@ -844,6 +845,7 @@ The Job file additionally supports some Vlocity Build based options and the opti
 | sf.username | Salesforce username when using sf.password | String | none |
 | type | DataPack Type used for packExportSingle command | String | none |
 | verbose | Show additional logging statements | Boolean | false |
+| wait | Wait time in minutes for SFDX/SF CLI deployment commands. Overrides job file wait setting | Integer | 33 |
 
 # Developer Workflow
 When developing on a large project, exporting DataPacks through Queries is not the ideal process. Instead, each developer should keep track of the major items that they are working on and extract those items as needed to commit to Version Control.

lib/datapacksjob.js

@@ -2801,7 +2801,7 @@ DataPacksJob.prototype.deployJob = async function(jobInfo) {
                 const mdapiDeployResult = await sfdxCommandRunner('mdapi:deploy', {
                     deploydir: mdapiTempFolder,
                     targetusername: this.vlocity.sfdxUsername,
-                    wait: -1,
+                    wait: jobInfo.wait || 33,
                     useSfCli: jobInfo.useSfCli,
                     useSfdxCli: jobInfo.useSfdxCli
                 });

lib/sfdx.js

@@ -31,9 +31,9 @@ const _sourceConvert = async (rootdir, outputdir, useSfdxCli) => {
 	_run(` sf project convert source --root-dir "${rootdir}" --output-dir "${outputdir}"`);
 }
 
-const _mdapiDeploy = async (targetusername, deploydir, useSfdxCli) => {
-	return useSfdxCli ? _run(`sfdx force:mdapi:deploy --deploydir "${deploydir}" --targetusername "${targetusername}" -w -1 --verbose`) :
-	_run(`sf project deploy start --metadata-dir "${deploydir}" --target-org "${targetusername}" --verbose`);
+const _mdapiDeploy = async (targetusername, deploydir, useSfdxCli, wait = 33) => {
+	return useSfdxCli ? _run(`sfdx force:mdapi:deploy --deploydir "${deploydir}" --targetusername "${targetusername}" -w ${wait} --verbose`) :
+	_run(`sf project deploy start --metadata-dir "${deploydir}" --target-org "${targetusername}" --wait ${wait} --verbose`);
 }
 
 const _orgDisplay = async (targetusername) => {
@@ -83,7 +83,7 @@ const run = async(command, options) => {
 	if (command === 'source:convert') {
 		return _sourceConvert(options.rootdir, options.outputdir, options.useSfdxCli);
 	} else if (command === 'mdapi:deploy'){
-		return _mdapiDeploy(options.targetusername, options.deploydir, options.useSfdxCli);
+		return _mdapiDeploy(options.targetusername, options.deploydir, options.useSfdxCli, options.wait);
 	} else if (command === 'org display'){
 		return _orgDisplay(options.targetusername);
 	} else if (command === 'source:deploy'){

lib/vlocitycli.js

@@ -110,7 +110,8 @@ var VLOCITY_COMMANDLINE_OPTIONS = {
     "ignoreLocalCompilationCards": Boolean,
     "puppeteerHttpProxy": String,
     "overrideOrgCommit": String,
-    "keepOSActiveWhenLWCDeploymentFails": Boolean
+    "keepOSActiveWhenLWCDeploymentFails": Boolean,
+    "wait": Number
 };
 
 var VLOCITY_COMMANDLINE_OPTIONS_SHORTHAND = {