Add changes to docker

Signed-off-by: Divya Madala <[email protected]>
Divyaasm · Jun 11, 2024 · 0f88837 · 0f88837
1 parent 28dba41
commit 0f88837
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile
@@ -203,7 +203,7 @@ pipeline {
                                 echo "Skipping the stage for zip distribution and arm64 architecture"
                                     continue
                             }
-                            validateDistributions["${local_distribution}-${local_architecture}"] = {
+                            validateDistributions["container-${local_architecture}"] = {
                                 // Using scripted pipelines to trigger dynamic parallel stages
                                 timeout(time: 30) {
                                     if ("${local_distribution}" == "docker"){

diff --git a/tests/jenkins/TestValidateArtifacts.groovy b/tests/jenkins/TestValidateArtifacts.groovy
@@ -42,6 +42,7 @@ class TestValidateArtifacts extends BuildPipelineTest {
         binding.setVariable('ARCHITECTURE', "x64 arm64")
         binding.setVariable('PLATFORM', "linux windows")
         binding.setVariable('PROJECTS', "Both")
+        binding.setVariable('DOCKER_SOURCE', "Both")
         binding.setVariable('ARTIFACT_TYPE', "production")
         binding.setVariable('OPTIONAL_ARGS', "using-staging-artifact-only")
 
@@ -56,7 +57,7 @@ class TestValidateArtifacts extends BuildPipelineTest {
     public void testValidateArtifactsPipeline() {
         super.testPipeline("jenkins/validate-artifacts/validate-artifacts.jenkinsfile",
                 "tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile")
-        assertThat(getCommandExecutions('sh', 'validation.sh'), hasItem('./validation.sh --version 2.3.0  --distribution docker  --arch x64 --projects opensearch opensearch-dashboards --docker-source dockerhub --os-build-number 6039 --osd-build-number 4104   --using-staging-artifact-only'))
+        assertThat(getCommandExecutions('sh', 'validation.sh'), hasItem('./validation.sh --version 2.3.0  --distribution docker  --arch x64 --projects opensearch opensearch-dashboards --docker-source dockerhub ecr --os-build-number 6039 --osd-build-number 4104   --using-staging-artifact-only'))
         assertThat(getCommandExecutions('sh', 'validation.sh'), hasItem('./validation.sh --version 2.3.0  --distribution tar --platform linux --arch x64 --projects opensearch opensearch-dashboards  --os-build-number 6039 --osd-build-number 4104 --artifact-type production'))
         assertThat(getCommandExecutions('sh', 'validation.sh'), hasItem('./validation.sh --version 2.3.0  --distribution yum --platform linux --arch x64 --projects opensearch opensearch-dashboards  --os-build-number 6039 --osd-build-number 4104 --artifact-type production'))
         assertThat(getCommandExecutions('sh', 'validation.sh'), hasItem('./validation.sh --version 2.3.0  --distribution rpm --platform linux --arch arm64 --projects opensearch opensearch-dashboards  --os-build-number 6039 --osd-build-number 4104 --artifact-type production'))

diff --git a/...jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt b/...jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt
@@ -23,9 +23,9 @@
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
                      validate-artifacts.node(Jenkins-Agent-AL2023-X64-C54xlarge-Single-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
-                        validate-artifacts.validateArtifacts({version=2.3.0, distribution=docker, arch=x64, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, docker_args=using-staging-artifact-only, docker_source=dockerhub})
+                        validate-artifacts.validateArtifacts({version=2.3.0, distribution=docker, arch=x64, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, docker_args=using-staging-artifact-only, docker_source=dockerhub ecr})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
-                           validateArtifacts.sh(./validation.sh --version 2.3.0  --distribution docker  --arch x64 --projects opensearch opensearch-dashboards --docker-source dockerhub --os-build-number 6039 --osd-build-number 4104   --using-staging-artifact-only)
+                           validateArtifacts.sh(./validation.sh --version 2.3.0  --distribution docker  --arch x64 --projects opensearch opensearch-dashboards --docker-source dockerhub ecr --os-build-number 6039 --osd-build-number 4104   --using-staging-artifact-only)
                         validate-artifacts.echo(Completed validation for docker-x64)
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})
@@ -85,9 +85,9 @@
                   validate-artifacts.timeout({time=30}, groovy.lang.Closure)
                      validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Single-Host, groovy.lang.Closure)
                         validate-artifacts.unstash(validate-artifacts-123)
-                        validate-artifacts.validateArtifacts({version=2.3.0, distribution=docker, arch=arm64, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, docker_args=using-staging-artifact-only, docker_source=dockerhub})
+                        validate-artifacts.validateArtifacts({version=2.3.0, distribution=docker, arch=arm64, os_build_number=6039, osd_build_number=4104, projects=opensearch opensearch-dashboards, docker_args=using-staging-artifact-only, docker_source=dockerhub ecr})
                            validateArtifacts.fileExists(/tmp/workspace/validation.sh)
-                           validateArtifacts.sh(./validation.sh --version 2.3.0  --distribution docker  --arch arm64 --projects opensearch opensearch-dashboards --docker-source dockerhub --os-build-number 6039 --osd-build-number 4104   --using-staging-artifact-only)
+                           validateArtifacts.sh(./validation.sh --version 2.3.0  --distribution docker  --arch arm64 --projects opensearch opensearch-dashboards --docker-source dockerhub ecr --os-build-number 6039 --osd-build-number 4104   --using-staging-artifact-only)
                         validate-artifacts.echo(Completed validation for docker-arm64)
                         validate-artifacts.postCleanup()
                            postCleanup.cleanWs({disableDeferredWipeout=true, deleteDirs=true})