Remove old args check on publishIntegTestResults (#489)

Signed-off-by: Peter Zhu <[email protected]>
opensearch-project · Aug 21, 2024 · f0454a4 · f0454a4
1 parent 571310e
commit f0454a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -127,7 +127,7 @@ jacocoTestReport {
     }
 }
 
-String version = '6.8.3'
+String version = '6.8.4'
 
 task updateVersion {
     doLast {

diff --git a/vars/publishIntegTestResults.groovy b/vars/publishIntegTestResults.groovy
@@ -26,9 +26,8 @@ void call(Map args = [:]) {
     def isNullOrEmpty = { str -> 
         str == null || (str instanceof String && str.trim().isEmpty())
     }
-    if (isNullOrEmpty(args.version) || isNullOrEmpty(args.distributionBuildNumber) || isNullOrEmpty(args.distributionBuildUrl) || 
-        isNullOrEmpty(args.rcNumber) || isNullOrEmpty(args.rc) || isNullOrEmpty(args.platform) || 
-        isNullOrEmpty(args.architecture) || isNullOrEmpty(args.distribution) || isNullOrEmpty(args.testReportManifestYml) || isNullOrEmpty(args.jobName)) {
+    // Check if any args is equals to null or it is a test run
+    if (isNullOrEmpty(args.distributionBuildUrl) || isNullOrEmpty(args.testReportManifestYml) || isNullOrEmpty(args.jobName) || args.jobName.equals('dummy_job')) {
         return null
     }
 
@@ -40,7 +39,6 @@ void call(Map args = [:]) {
     def formattedDate = new SimpleDateFormat("MM-yyyy").format(currentDate)
     def testReportManifestYml = args.testReportManifestYml
     def jobName = args.jobName
-    def testReportManifestYmlUrl = "https://ci.opensearch.org/ci/dbc/${jobName}/${version}/${distributionBuildNumber}/${platform}/${architecture}/${distribution}/test-results/${integTestBuildNumber}/integ-test/test-report.yml"
     def manifestFile = readFile testReportManifestYml
     def manifest = readYaml text: manifestFile
     def indexName = "opensearch-integration-test-results-${formattedDate}"
@@ -52,6 +50,7 @@ void call(Map args = [:]) {
     def platform = manifest.platform
     def architecture = manifest.architecture
     def distribution = manifest.distribution
+    def testReportManifestYmlUrl = "https://ci.opensearch.org/ci/dbc/${jobName}/${version}/${distributionBuildNumber}/${platform}/${architecture}/${distribution}/test-results/${integTestBuildNumber}/integ-test/test-report.yml"
 
     manifest.components.each { component ->
         def componentName = component.name