Fix validation workflow params in central release workflow

Signed-off-by: Sayali Gaikawad <[email protected]>
opensearch-project · Jul 17, 2024 · 79a5634 · 79a5634
1 parent 818fcaa
commit 79a5634
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/jenkins/promotion/release-promotion.jenkinsfile b/jenkins/promotion/release-promotion.jenkinsfile
@@ -494,10 +494,10 @@ pipeline {
                 string(name: 'DISTRIBUTION', value: 'tar rpm yum deb zip docker'),
                 string(name: 'ARCHITECTURE', value: 'x64 arm64'),
                 string(name: 'PLATFORM', value: 'linux windows'),
-                string(name: 'PROJECTS', value: 'Both'),
-                string(name: 'DOCKER_SOURCE', value: 'Both'),
-                string(name: 'ARTIFACT_TYPE', value: 'production'),
-                string(name: 'OPTIONAL_ARGS', value: 'validate-digests-only')
+                choice(name: 'OPTIONAL_ARGS', value: 'validate-digests-only'),
+                choice(name: 'DOCKER_SOURCE', value: 'Both'),
+                choice(name: 'ARTIFACT_TYPE', value: 'production'),
+                choice(name: 'PROJECTS', value: 'Both'),
                 ]
             echo 'Artifacts are successfully validated!'
             }

diff --git a/tests/jenkins/TestOpenSearchReleasePromotionTest.groovy b/tests/jenkins/TestOpenSearchReleasePromotionTest.groovy
@@ -186,10 +186,10 @@ class TestOpenSearchReleasePromotionTest extends BuildPipelineTest {
         assertCallStack().contains('release-promotion.string({name=DISTRIBUTION, value=tar rpm yum deb zip docker})')
         assertCallStack().contains('release-promotion.string({name=ARCHITECTURE, value=x64 arm64})')
         assertCallStack().contains('release-promotion.string({name=PLATFORM, value=linux windows})')
-        assertCallStack().contains('release-promotion.string({name=PROJECTS, value=Both})')
-        assertCallStack().contains('release-promotion.string({name=DOCKER_SOURCE, value=Both})')
-        assertCallStack().contains('release-promotion.string({name=ARTIFACT_TYPE, value=production})')
-        assertCallStack().contains('release-promotion.string({name=OPTIONAL_ARGS, value=validate-digests-only})')
+        assertCallStack().contains('release-promotion.choice({name=PROJECTS, value=Both})')
+        assertCallStack().contains('release-promotion.choice({name=DOCKER_SOURCE, value=Both})')
+        assertCallStack().contains('release-promotion.choice({name=ARTIFACT_TYPE, value=production})')
+        assertCallStack().contains('release-promotion.choice({name=OPTIONAL_ARGS, value=validate-digests-only})')
         assertCallStack().contains('release-promotion.build({job=distribution-validation, wait=true, parameters=[null, null, null, null, null, null, null, null]})')
 
         // Maven Promotion Workflow

diff --git a/tests/jenkins/jenkinsjob-regression-files/promotion/release-promotion.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/promotion/release-promotion.jenkinsfile.txt
@@ -224,10 +224,10 @@
             release-promotion.string({name=DISTRIBUTION, value=tar rpm yum deb zip docker})
             release-promotion.string({name=ARCHITECTURE, value=x64 arm64})
             release-promotion.string({name=PLATFORM, value=linux windows})
-            release-promotion.string({name=PROJECTS, value=Both})
-            release-promotion.string({name=DOCKER_SOURCE, value=Both})
-            release-promotion.string({name=ARTIFACT_TYPE, value=production})
-            release-promotion.string({name=OPTIONAL_ARGS, value=validate-digests-only})
+            release-promotion.choice({name=OPTIONAL_ARGS, value=validate-digests-only})
+            release-promotion.choice({name=DOCKER_SOURCE, value=Both})
+            release-promotion.choice({name=ARTIFACT_TYPE, value=production})
+            release-promotion.choice({name=PROJECTS, value=Both})
             release-promotion.build({job=distribution-validation, wait=true, parameters=[null, null, null, null, null, null, null, null]})
             release-promotion.echo(Artifacts are successfully validated!)
          release-promotion.stage(Publish to Maven, groovy.lang.Closure)