Merge pull request #27 from checkmarx-ltd/PLUG-977

Update Jenkinsfile

Author: cx-rahul-pidde

Jenkinsfile

@@ -3,12 +3,13 @@
 
 def ipAddress
 def vmName = "Plugin-VisualStudio-" + UUID.randomUUID().toString()
-def msbuildLocation = "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Professional\\MSBuild\\Current\\Bin\\MSBuild.exe\""
+def msbuildLocationVS2019 = "\"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\MSBuild\\Current\\Bin\\MSBuild.exe\""
+def msbuildLocationVS2022 = "\"C:\\Program Files\\Microsoft Visual Studio\\2022\\Professional\\MSBuild\\Current\\Bin\\MSBuild.exe\""
 
 pipeline {
     parameters {
         string(name: "decommissionPeriod", defaultValue: "3 hour", description: "Decommission period")
-		string(name: "templateName", defaultValue: "VisualStudio-Template", description: "Template name, if not specified then \"VisualStudio-Template\" template will be chosen")
+		choice(name: "templateName", choices: ["VisualStudio2019-Template","VisualStudio2022-Template"], description: "Template name, if not specified then \"VisualStudio2019-Template\" template will be chosen")
         booleanParam(name: 'doNotDeleteVM', defaultValue: false, description: 'If selected, VM will not be deleted after process finished')
 		gitParameter branchFilter: 'origin/(.*)', defaultValue: 'master', name: 'branch', type: 'PT_BRANCH'
     }
@@ -29,7 +30,13 @@ pipeline {
             agent { node { label vmName } }
             steps {
                 script {
-                    bat "${msbuildLocation} ${WORKSPACE}\\${JOB_NAME}\\ci.msbuild /t:CI /p:VisualStudioVersion=\"16.0\" /p:DeployExtension=false"
+                    	if(templateName == "VisualStudio2019-Template")
+			{
+				bat "${msbuildLocationVS2019} ${WORKSPACE}\\ci.msbuild /t:CI /p:VisualStudioVersion=\"16.0\" /p:DeployExtension=false"
+			}
+			else {
+				bat "${msbuildLocationVS2022} ${WORKSPACE}\\ci.msbuild2022 /t:CI /p:VisualStudioVersion=\"17.0\" /p:DeployExtension=false"
+			}
                 }
             }
         }
@@ -38,8 +45,16 @@ pipeline {
             agent { node { label vmName } }
             steps {
                 script {
-		    fileOperations([folderRenameOperation(source: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX.vsix", destination: "${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.8.vsix")])
-                    kit.Upload_To_Artifactory("${WORKSPACE}\\${JOB_NAME}\\Artifacts\\CxViewerVSIX-9.00.8.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
+		    	if(templateName == "VisualStudio2019-Template")
+			{
+				fileOperations([folderRenameOperation(source: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-2019.vsix", destination: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix")])
+				kit.Upload_To_Artifactory("${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
+			}
+			else 
+			{
+				fileOperations([folderRenameOperation(source: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-2022.vsix", destination: "${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix")])
+				kit.Upload_To_Artifactory("${WORKSPACE}\\Artifacts\\CxViewerVSIX-9.00.19.vsix", "plugins-release-local/com/checkmarx/visual-studio/")
+			}
                 }
             }
         }
@@ -48,7 +63,7 @@ pipeline {
     post {
         always {
             script {
-                logstashSend failBuild: false, maxLines: 1000
+                //logstashSend failBuild: false, maxLines: 1000  - commented code due to job failed because of logstashSend plugin not found 
                 if (ipAddress != null) {
                     try {
                         if (doNotDeleteVM == 'true') {