Fix tests

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
gaiksaya · Jun 6, 2024 · 372608c · 372608c
1 parent 9eb06c9
commit 372608c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/tests/jenkins/TestOpenSearchReleasePromotionParallelTest.groovy b/tests/jenkins/TestOpenSearchReleasePromotionParallelTest.groovy
@@ -144,13 +144,6 @@ class TestOpenSearchReleasePromotionTestParallel extends BuildPipelineTest {
         assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_NAME, value=tar})")
         assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_ARCHITECTURE, value=arm64})")
 
-        // OpenSearch Linux tar x64
-        assertCallStack().contains('stage(OpenSearch Linux tar x64, groovy.lang.Closure)')
-        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_JOB_NAME, value=distribution-build-opensearch})")
-        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_PLATFORM, value=linux})")
-        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_NAME, value=tar})")
-        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_ARCHITECTURE, value=x64})")
-
         // OpenSearch Dashboards Linux tar arm64
         assertCallStack().contains('stage(OpenSearch Dashboards Linux tar arm64, groovy.lang.Closure)')
         assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_JOB_NAME, value=distribution-build-opensearch-dashboards})")
@@ -164,5 +157,12 @@ class TestOpenSearchReleasePromotionTestParallel extends BuildPipelineTest {
         assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_PLATFORM, value=linux})")
         assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_NAME, value=tar})")
         assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_ARCHITECTURE, value=x64})")
+
+        // OpenSearch Linux tar x64
+        assertCallStack().contains('stage(Publish OpenSearch Linux tar x64, groovy.lang.Closure)')
+        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_JOB_NAME, value=distribution-build-opensearch})")
+        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_PLATFORM, value=linux})")
+        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_NAME, value=tar})")
+        assertCallStack().contains("release-promotion-parallel.string({name=DISTRIBUTION_ARCHITECTURE, value=x64})")
     }
 }
diff --git a/.../jenkins/jenkinsjob-regression-files/promotion/release-promotion-parallel.jenkinsfile.txt b/.../jenkins/jenkinsjob-regression-files/promotion/release-promotion-parallel.jenkinsfile.txt
@@ -185,7 +185,7 @@
             release-promotion-parallel.string({name=INPUT_MANIFEST, value=1.0.0/opensearch-dashboards-1.0.0.yml})
             release-promotion-parallel.build({job=distribution-promote-artifacts, wait=true, parameters=[null, null, null, null, null, null]})
             release-promotion-parallel.echo(Promotion successful for OpenSearch Dashboards Linux tar x64!)
-         release-promotion-parallel.stage(OpenSearch Linux tar x64, groovy.lang.Closure)
+         release-promotion-parallel.stage(Publish OpenSearch Linux tar x64, groovy.lang.Closure)
             release-promotion-parallel.echo(Executing on agent [docker:[alwaysPull:true, args:, containerPerStageRoot:false, label:Jenkins-Agent-AL2023-X64-C54xlarge-Docker-Host, image:docker/library/alpine:3, reuseNode:false, registryUrl:https://public.ecr.aws/, stages:[:]]])
             release-promotion-parallel.echo(Triggering distribution-promote-artifacts for OpenSearch Linux tar x64)
             release-promotion-parallel.string({name=DISTRIBUTION_JOB_NAME, value=distribution-build-opensearch})