Generate TRC document in D instead of Q. (#1029)

* Generate TRC doc in D instead of Q. * Update cahngelog. * Update change log. * Fix test resource name. * Fix tests. * Remove unused import. * Fix codenarc violations. --------- Co-authored-by: zxBCN Valeriu_Tuguran,Constantin (IT EDP) EXTERNAL <[email protected]>
opendevstack · Sep 6, 2023 · 5808241 · 5808241
1 parent a6a84a3
commit 5808241
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 ### Changed
 
 ### Fixed
+- Generate TRC document in D environment instead of Q ([#1029](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1029))
 - Align tailor drift check for D, Q envs ([#1024](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1024))
 
 ## [4.3.1] - 2023-07-12

diff --git a/src/org/ods/orchestration/scheduler/LeVADocumentScheduler.groovy b/src/org/ods/orchestration/scheduler/LeVADocumentScheduler.groovy
@@ -187,6 +187,7 @@ class LeVADocumentScheduler extends DocGenScheduler {
             (DocumentType.DTP as String)    : ["${DocumentType.DTP}"],
             (DocumentType.DTR as String)    : ["${DocumentType.DTR}"],
             (DocumentType.OVERALL_DTR as String)    : ["${DocumentType.DTR}"],
+            (DocumentType.TRC as String)    : ["${DocumentType.TRC}"]
         ],
         "Q": [
             (DocumentType.TIR as String)    : ["${DocumentType.TIR}_Q"],
@@ -195,7 +196,6 @@ class LeVADocumentScheduler extends DocGenScheduler {
             (DocumentType.OVERALL_IVR as String)    : ["${DocumentType.IVR}_Q"],
             (DocumentType.CFTR as String)   : ["${DocumentType.CFTR}"],
             (DocumentType.TCR as String)    : ["${DocumentType.TCR}"],
-            (DocumentType.TRC as String)    : ["${DocumentType.TRC}"],
             (DocumentType.DIL as String)    : ["${DocumentType.DIL}_Q"]
         ],
         "P": [

diff --git a/src/org/ods/orchestration/usecase/JiraUseCase.groovy b/src/org/ods/orchestration/usecase/JiraUseCase.groovy
@@ -290,7 +290,7 @@ class JiraUseCase {
         }
 
         if (checkDuplicateTestResults && duplicatesKeys) {
-            throw new IllegalStateException("${duplicateKeysErrorMessage}${duplicatesKeys.join(', ')}.");
+            throw new IllegalStateException("${duplicateKeysErrorMessage}${duplicatesKeys.join(', ')}.")
         }
     }
 
@@ -385,7 +385,6 @@ class JiraUseCase {
         } else {
             logger.warn("*NO* Comment was added to Jira issue with key ${releaseStatusIssueKey}")
         }
-
     }
 
     Long getLatestDocVersionId(List<Map> trackingIssues) {

diff --git a/test/groovy/org/ods/orchestration/scheduler/LeVADocumentSchedulerSpec.groovy b/test/groovy/org/ods/orchestration/scheduler/LeVADocumentSchedulerSpec.groovy
@@ -10,7 +10,6 @@ import org.ods.orchestration.service.*
 import org.ods.orchestration.usecase.*
 import org.ods.orchestration.util.*
 import org.ods.util.ILogger
-import org.ods.util.IPipelineSteps
 import org.ods.util.Logger
 
 import spock.lang.*
@@ -6287,6 +6286,7 @@ class LeVADocumentSchedulerSpec extends SpecHelper {
         1 * usecase.invokeMethod("createTCP", [null, null] as Object[])
         1 * usecase.invokeMethod('createTIP', [null, null] as Object[])
         1 * usecase.invokeMethod('createSSDS', [null, null] as Object[])
+        1 * usecase.invokeMethod('createTRC', [null, null] as Object[])
         0 * usecase.invokeMethod(*_)
 
         when:
@@ -7083,7 +7083,6 @@ class LeVADocumentSchedulerSpec extends SpecHelper {
             DocumentType.IVR as String,
             DocumentType.CFTR as String,
             DocumentType.TCR as String,
-            DocumentType.TRC as String,
             DocumentType.DIL as String,
         ]
 

diff --git a/test/groovy/org/ods/orchestration/usecase/LeVADocumentUseCaseSpec.groovy b/test/groovy/org/ods/orchestration/usecase/LeVADocumentUseCaseSpec.groovy
@@ -1703,7 +1703,7 @@ class LeVADocumentUseCaseSpec extends SpecHelper {
             RA: 'ConfigItem / See version created within this change',
             RA_version: 'WIP/2',
             TRC: 'ConfigItem / See version created within this change',
-            TRC_version: 'WIP/1',
+            TRC_version: 'WIP/2',
             DTP: 'ConfigItem / See version created within this change',
             DTP_version: 'WIP/2',
             DTR: 'ConfigItem / See version created within this change',

diff --git a/...13/projectData/documentHistory-Q-TRC.json → ...13/projectData/documentHistory-D-TRC.json b/...13/projectData/documentHistory-Q-TRC.json → ...13/projectData/documentHistory-D-TRC.json