Skip to content

Commit 3a101d0

Browse files
committed
Updates
1 parent 52cfe78 commit 3a101d0

File tree

7 files changed

+285
-197
lines changed

7 files changed

+285
-197
lines changed

README.md

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ This plugin allows the user to create Single and Pipeline Jobs to build and exec
4949
* [Using Change Based Testing Imported Results with QA Project](#using-change-based-testing-imported-results-with-qa-project)
5050
* [Disabled environments may add coverage metrics](#disabled-environments-may-add-coverage-metrics)
5151
* [Change Log](#change-log)
52-
* [Version 0.78 (15 Mar 2025)](#version-078-3-mar-2025)
52+
* [Version 0.79 (4 May 2025)](#version-079-4-may-2025)
53+
* [Version 0.78 (1 Apr 2025)](#version-078-1-apr-2025)
5354
* [Version 0.77 (21 Aug 2024)](#version-077-21-aug-2024)
5455
* [Version 0.76 (19 Jan 2023)](#version-076-19-jan-2023)
5556
* [Version 0.75 (23 Dec 2022)](#version-075-23-dec-2022)
@@ -388,7 +389,16 @@ environment before disabling. This takes into account enviornments that are dir
388389

389390
## Change Log
390391

391-
### Version 0.78 (3 Mar 2025)
392+
### Version 0.79 (4 May 2025)
393+
- Moved to minimum Jenkins Version 2.492.3 and Java 21
394+
- Fix pom.xml to get a build of the plugin and to Java21
395+
- Fix Update NewSingleJob to catch new execption thrown from SecureGroovyScript
396+
- Fix jenkinsfile pipeline script to match up with the latest groovy intepreter
397+
- Missing def before globals
398+
- Pipeline can access VC_ global vars, but not functions
399+
- Need to pass all required VC_ global vars to functions
400+
401+
### Version 0.78 (1 Apr 2025)
392402
- Moved to minimum Jenkins version: 2.452.1 and Java 11
393403
- Adding in following capabilities
394404
- Extended Cobertura format output for use with [Jenkins Coverage Plugin](https://github.com/jenkinsci/coverage-plugin)

pom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@
116116
<dependency>
117117
<groupId>com.github.spotbugs</groupId>
118118
<artifactId>spotbugs-annotations</artifactId>
119+
<version>4.9.3</version>
119120
</dependency>
121+
120122
<dependency>
121123
<groupId>org.mockito</groupId>
122124
<artifactId>mockito-core</artifactId>
@@ -235,7 +237,7 @@
235237
<plugin>
236238
<groupId>com.github.spotbugs</groupId>
237239
<artifactId>spotbugs-maven-plugin</artifactId>
238-
<version>4.8.5.0</version>
240+
<version>4.9.3.0</version>
239241
<configuration>
240242
<xmlOutput>true</xmlOutput>
241243
<failOnError>false</failOnError>

src/main/java/com/vectorcast/plugins/vectorcastexecution/job/NewPipelineJob.java

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -568,55 +568,55 @@ private String generateJenkinsfile() throws IOException {
568568
+ "//\n"
569569
+ "// ===========================================================\n"
570570
+ "\n"
571-
+ "VC_Manage_Project = \'" + getManageProjectName() + "\'\n"
572-
+ "VC_EnvSetup = '''" + setup + "'''\n"
573-
+ "VC_Build_Preamble = \"" + preamble + "\"\n"
574-
+ "VC_EnvTeardown = '''" + teardown + "'''\n"
571+
+ "def VC_Manage_Project = \'" + getManageProjectName() + "\'\n"
572+
+ "def VC_EnvSetup = '''" + setup + "'''\n"
573+
+ "def VC_Build_Preamble = \"" + preamble + "\"\n"
574+
+ "def VC_EnvTeardown = '''" + teardown + "'''\n"
575575
+ "def scmStep () { " + pipelineSCM + " }\n"
576576
+ "VC_usingSCM = "
577577
+ String.valueOf(pipelineSCM.length() != 0) + "\n"
578-
+ "VC_postScmStepsCmds = '''" + postCheckoutCmds + "'''\n"
579-
+ "VC_sharedArtifactDirectory = '''"
578+
+ "def VC_postScmStepsCmds = '''" + postCheckoutCmds + "'''\n"
579+
+ "def VC_sharedArtifactDirectory = '''"
580580
+ sharedArtifactDirectory + "'''\n"
581-
+ "VC_Agent_Label = '" + getNodeLabel() + "'\n"
582-
+ "VC_waitTime = '" + getWaitTime() + "'\n"
583-
+ "VC_waitLoops = '" + getWaitLoops() + "'\n"
584-
+ "VC_maxParallel = " + getMaxParallel().toString() + "\n"
585-
+ "VC_useOneCheckoutDir = " + singleCheckout + "\n"
586-
+ "VC_UseCILicense = " + vcUseCi + "\n"
587-
+ "VC_useCBT = " + incremental + "\n"
588-
+ "VC_useCoveragePlugin = " + getUseCoveragePlugin() + "\n"
589-
+ "VC_createdWithVersion = '"
581+
+ "def VC_Agent_Label = '" + getNodeLabel() + "'\n"
582+
+ "def VC_waitTime = '" + getWaitTime() + "'\n"
583+
+ "def VC_waitLoops = '" + getWaitLoops() + "'\n"
584+
+ "def VC_maxParallel = " + getMaxParallel().toString() + "\n"
585+
+ "def VC_useOneCheckoutDir = " + singleCheckout + "\n"
586+
+ "def VC_UseCILicense = " + vcUseCi + "\n"
587+
+ "def VC_useCBT = " + incremental + "\n"
588+
+ "def VC_useCoveragePlugin = " + getUseCoveragePlugin() + "\n"
589+
+ "def VC_createdWithVersion = '"
590590
+ VcastUtils.getVersion().orElse("Unknown") + "'\n"
591-
+ "VC_usePCLintPlus = "
591+
+ "def VC_usePCLintPlus = "
592592
+ String.valueOf(getPclpCommand().length() != 0) + "\n"
593-
+ "VC_pclpCommand = '" + getPclpCommand() + "'\n"
594-
+ "VC_pclpResultsPattern = '" + getPclpResultsPattern() + "'\n"
595-
+ "VC_useSquore = "
593+
+ "def VC_pclpCommand = '" + getPclpCommand() + "'\n"
594+
+ "def VC_pclpResultsPattern = '" + getPclpResultsPattern() + "'\n"
595+
+ "def VC_useSquore = "
596596
+ String.valueOf(getSquoreCommand().length() != 0) + "\n"
597-
+ "VC_squoreCommand = '''" + getSquoreCommand() + "'''\n"
598-
+ "VC_useTESTinsights = "
597+
+ "def VC_squoreCommand = '''" + getSquoreCommand() + "'''\n"
598+
+ "def VC_useTESTinsights = "
599599
+ String.valueOf(getTestInsightsUrl().length() != 0) + "\n"
600-
+ "VC_TESTinsights_URL = '" + getTestInsightsUrl() + "'\n"
601-
+ "VC_TESTinsights_Project = \""
600+
+ "def VC_TESTinsights_URL = '" + getTestInsightsUrl() + "'\n"
601+
+ "def VC_TESTinsights_Project = \""
602602
+ getTestInsightsProject() + "\"\n"
603-
+ "VC_TESTinsights_Proxy = '" + getTestInsightsProxy() + "'\n"
604-
+ "VC_TESTinsights_Credential_ID = '"
603+
+ "def VC_TESTinsights_Proxy = '" + getTestInsightsProxy() + "'\n"
604+
+ "def VC_TESTinsights_Credential_ID = '"
605605
+ getTestInsightsCredentialsId() + "'\n"
606-
+ "VC_TESTinsightsScmUrl = '"
606+
+ "def VC_TESTinsightsScmUrl = '"
607607
+ getTestInsightsScmUrl() + "'\n"
608-
+ "VC_TESTinsights_SCM_Tech = '"
608+
+ "def VC_TESTinsights_SCM_Tech = '"
609609
+ getTestInsightsScmTech() + "'\n"
610-
+ "VC_TESTinsights_Revision = \"\"\n"
611-
+ "VC_useCoverageHistory = " + getUseCoverageHistory() + "\n"
612-
+ "VC_useStrictImport = " + getUseStrictTestcaseImport() + "\n"
613-
+ "VC_useRGW3 = " + getUseRGW3() + "\n"
614-
+ "VC_useImportedResults = " + getUseImportedResults() + "\n"
615-
+ "VC_useLocalImportedResults = "
610+
+ "def VC_TESTinsights_Revision = \"\"\n"
611+
+ "def VC_useCoverageHistory = " + getUseCoverageHistory() + "\n"
612+
+ "def VC_useStrictImport = " + getUseStrictTestcaseImport() + "\n"
613+
+ "def VC_useRGW3 = " + getUseRGW3() + "\n"
614+
+ "def VC_useImportedResults = " + getUseImportedResults() + "\n"
615+
+ "def VC_useLocalImportedResults = "
616616
+ getUseLocalImportedResults() + "\n"
617-
+ "VC_useExternalImportedResults = "
617+
+ "def VC_useExternalImportedResults = "
618618
+ getUseExternalImportedResults() + "\n"
619-
+ "VC_externalResultsFilename = \""
619+
+ "def VC_externalResultsFilename = \""
620620
+ getExternalResultsFilename() + "\"\n"
621621
+ "\n";
622622

0 commit comments

Comments
 (0)