Skip to content

Commit f0454a4

Browse files
Remove old args check on publishIntegTestResults (opensearch-project#489)
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
1 parent 571310e commit f0454a4

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jacocoTestReport {
127127
}
128128
}
129129

130-
String version = '6.8.3'
130+
String version = '6.8.4'
131131

132132
task updateVersion {
133133
doLast {

vars/publishIntegTestResults.groovy

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ void call(Map args = [:]) {
2626
def isNullOrEmpty = { str ->
2727
str == null || (str instanceof String && str.trim().isEmpty())
2828
}
29-
if (isNullOrEmpty(args.version) || isNullOrEmpty(args.distributionBuildNumber) || isNullOrEmpty(args.distributionBuildUrl) ||
30-
isNullOrEmpty(args.rcNumber) || isNullOrEmpty(args.rc) || isNullOrEmpty(args.platform) ||
31-
isNullOrEmpty(args.architecture) || isNullOrEmpty(args.distribution) || isNullOrEmpty(args.testReportManifestYml) || isNullOrEmpty(args.jobName)) {
29+
// Check if any args is equals to null or it is a test run
30+
if (isNullOrEmpty(args.distributionBuildUrl) || isNullOrEmpty(args.testReportManifestYml) || isNullOrEmpty(args.jobName) || args.jobName.equals('dummy_job')) {
3231
return null
3332
}
3433

@@ -40,7 +39,6 @@ void call(Map args = [:]) {
4039
def formattedDate = new SimpleDateFormat("MM-yyyy").format(currentDate)
4140
def testReportManifestYml = args.testReportManifestYml
4241
def jobName = args.jobName
43-
def testReportManifestYmlUrl = "https://ci.opensearch.org/ci/dbc/${jobName}/${version}/${distributionBuildNumber}/${platform}/${architecture}/${distribution}/test-results/${integTestBuildNumber}/integ-test/test-report.yml"
4442
def manifestFile = readFile testReportManifestYml
4543
def manifest = readYaml text: manifestFile
4644
def indexName = "opensearch-integration-test-results-${formattedDate}"
@@ -52,6 +50,7 @@ void call(Map args = [:]) {
5250
def platform = manifest.platform
5351
def architecture = manifest.architecture
5452
def distribution = manifest.distribution
53+
def testReportManifestYmlUrl = "https://ci.opensearch.org/ci/dbc/${jobName}/${version}/${distributionBuildNumber}/${platform}/${architecture}/${distribution}/test-results/${integTestBuildNumber}/integ-test/test-report.yml"
5554

5655
manifest.components.each { component ->
5756
def componentName = component.name

0 commit comments

Comments
 (0)