BUGFIX: ods-deployments file repeats image in mono repository setup

CHANGELOG.md

@@ -1,7 +1,9 @@
 # Changelog
 
 ## Unreleased
-
+- Fix ods-deployments file repeats image in mono repository setup ([#1011](https://github.com/opendevstack/ods-jenkins-shared-library/issues/1011))
+- Fix parameter count warning in ([86e1d](https://github.com/opendevstack/ods-jenkins-shared-library/commit/86e1d583b271446ef1489339da0912f78406e40d))
+- Remove `jvmArgs "-XX:MaxPermSize=256m"` from build.gradle as it is no longer supported (See https://docs.oracle.com/javase/9/migrate/#GUID-1F270BDA-50B0-49C8-807E-0B727CCC5169)
 ### Added
 
 ### Changed

build.gradle

@@ -121,7 +121,6 @@ test {
     systemProperty 'com.athaydes.spockframework.report.projectName', 'ods-jenkins-shared-library'
     systemProperty 'com.athaydes.spockframework.report.projectVersion', version
     maxHeapSize = "2048m"
-    jvmArgs "-XX:MaxPermSize=256m"
     systemProperty "testRecordMode", project.findProperty('testRecordMode')?: false
     systemProperty "generateExpectedPdfFiles", project.findProperty('generateExpectedPdfFiles')?: false
     systemProperty "nexusURL", project.findProperty('nexusURL')?: "http://nexus.odsbox.lan:7990"
@@ -137,7 +136,7 @@ test {
 }
 
 codenarc {
-    toolVersion = '1.5'
+    toolVersion = '1.6'
     configFile = file('codenarc.groovy')
     maxPriority1Violations = 0
     maxPriority2Violations = 1

src/org/ods/component/HelmDeploymentStrategy.groovy

@@ -226,7 +226,7 @@ class HelmDeploymentStrategy extends AbstractDeploymentStrategy {
             resourceNames.each { resourceName ->
 
                 def podData = [:]
-                podData = openShift.checkForPodData(context.targetProject, options.selector)
+                podData = openShift.checkForPodData(context.targetProject, options.selector, resourceName)
                 context.addDeploymentToArtifactURIs("${resourceName}-deploymentMean",
                     [
                         'type': 'helm',

src/org/ods/orchestration/util/DocumentHistoryEntry.groovy

@@ -11,6 +11,7 @@ class DocumentHistoryEntry implements Map, Serializable {
     private final String docVersion
     String rational
 
+    @SuppressWarnings('ParameterCount')
     DocumentHistoryEntry(Map map, Long entryId, String projectVersion,
                          String previousProjectVersion, String docVersion, String rational) {
         def delegate = (Map) map.clone()

src/org/ods/services/OpenShiftService.groovy

@@ -1024,7 +1024,7 @@ class OpenShiftService {
     // checkForPodData returns a subset of information from every pod, once
     // all pods matching the label are "running". If this is not the case,
     // it returns an empty list.
-    List<PodData> checkForPodData(String project, String label) {
+    List<PodData> checkForPodData(String project, String label, String resourceName=null) {
         List<PodData> pods = []
         def stdout = steps.sh(
             script: "oc -n ${project} get pod -l ${label} -o json",
@@ -1033,7 +1033,12 @@ class OpenShiftService {
         ).toString().trim()
         def podJson = new JsonSlurperClassic().parseText(stdout)
         if (podJson && podJson.items.collect { it.status?.phase?.toLowerCase() }.every { it == 'running' }) {
-            pods = extractPodData(podJson)
+            if (podJson && resourceName && podJson.items.collect { it.metadata.name }.every {
+                it.startsWith(resourceName) }) {
+                pods = extractPodData(podJson)
+            } else {
+                pods = extractPodData(podJson)
+            }
         }
         pods
     }

test/groovy/org/ods/component/HelmDeploymentStrategySpec.groovy

@@ -62,7 +62,7 @@ class HelmDeploymentStrategySpec extends PipelineSpockTestBase {
         def ctxData = contextData + [environment: 'dev', targetProject: 'foo-dev', openshiftRolloutTimeoutRetries: 5, chartDir: 'chart']
         IContext context = new Context(null, ctxData, logger)
         OpenShiftService openShiftService = Mock(OpenShiftService.class)
-        openShiftService.checkForPodData('foo-dev', 'app=foo-bar') >> [new PodData([deploymentId: "${contextData.componentId}-124"])]
+        openShiftService.checkForPodData(*_) >> [new PodData([deploymentId: "${contextData.componentId}-124"])]
         ServiceRegistry.instance.add(OpenShiftService, openShiftService)
 
         JenkinsService jenkinsService = Stub(JenkinsService.class)

test/groovy/vars/OdsComponentStageRolloutOpenShiftDeploymentSpec.groovy

@@ -157,7 +157,7 @@ class OdsComponentStageRolloutOpenShiftDeploymentSpec extends PipelineSpockTestB
     openShiftService.rollout(*_) >> "${config.componentId}-124"
     openShiftService.getPodDataForDeployment(*_) >> [new PodData([ deploymentId: "${config.componentId}-124" ])]
     openShiftService.getImagesOfDeployment(*_) >> [[ repository: 'foo', name: 'bar' ]]
-    openShiftService.checkForPodData('foo-dev', 'app=foo-bar') >> [new PodData([deploymentId: "${config.componentId}-124"])]
+    openShiftService.checkForPodData(*_) >> [new PodData([deploymentId: "${config.componentId}-124"])]
     ServiceRegistry.instance.add(OpenShiftService, openShiftService)
     JenkinsService jenkinsService = Stub(JenkinsService.class)
     jenkinsService.maybeWithPrivateKeyCredentials(*_) >> { args -> args[1]('/tmp/file') }