Change default docker image to support python 3.9 (#239)

Signed-off-by: Sayali Gaikawad <[email protected]>
opensearch-project · Jul 7, 2023 · decfc06 · decfc06
1 parent 7f64de7
commit decfc06
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -120,7 +120,7 @@ jacocoTestReport {
     }
 }
 
-String version = '4.4.0'
+String version = '5.0.0'
 
 task updateVersion {
     doLast {

diff --git a/tests/jenkins/TestStandardReleasePipeline.groovy b/tests/jenkins/TestStandardReleasePipeline.groovy
@@ -54,7 +54,7 @@ class TestStandardReleasePipeline extends BuildPipelineTest {
         }
 
         assertThat(echoCommand.size(), equalTo(1))
-        assertThat(echoCommand, hasItem('Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]'))
+        assertThat(echoCommand, hasItem('Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v4, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]'))
     }
 
     def getEchoCommands() {

diff --git a/tests/jenkins/TestStandardReleasePipelineWithGenericTriggers.groovy b/tests/jenkins/TestStandardReleasePipelineWithGenericTriggers.groovy
@@ -127,7 +127,7 @@ class TestStandardReleasePipelineWithGenericTriggers extends BuildPipelineTest {
         }
 
         assertThat(echoCommand.size(), equalTo(1))
-        assertThat(echoCommand, hasItem('Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]'))
+        assertThat(echoCommand, hasItem('Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v4, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]'))
     }
 
     @Test

diff --git a/tests/jenkins/jobs/StandardReleasePipelineWithGenericTriggersTag_Jenkinsfile.txt b/tests/jenkins/jobs/StandardReleasePipelineWithGenericTriggersTag_Jenkinsfile.txt
@@ -2,7 +2,7 @@
       StandardReleasePipelineWithGenericTriggersTag_Jenkinsfile.standardReleasePipelineWithGenericTrigger({jsonValue=.ref, tokenIdCredential=opensearch-ci-webhook-trigger-token, causeString=A tag was cut on opensearch-ci repo, regexpFilterText=$ref, regexpFilterExpression=^refs/tags/.*}, groovy.lang.Closure)
          standardReleasePipelineWithGenericTrigger.pipeline(groovy.lang.Closure)
             standardReleasePipelineWithGenericTrigger.timeout({time=1, unit=HOURS})
-            standardReleasePipelineWithGenericTrigger.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]])
+            standardReleasePipelineWithGenericTrigger.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v4, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]])
             standardReleasePipelineWithGenericTrigger.GenericTrigger({genericVariables=[{key=ref, value=.ref}, {key=repository, value=$.repository.html_url}, {key=action, value=$.action}, {key=isDraft, value=$.release.draft}, {key=release_url, value=$.release.url}, {key=assets_url, value=$.release.assets_url}], tokenCredentialId=opensearch-ci-webhook-trigger-token, causeString=A tag was cut on opensearch-ci repo, printContributedVariables=false, printPostContent=false, regexpFilterText=$ref, regexpFilterExpression=^refs/tags/.*})
             standardReleasePipelineWithGenericTrigger.echo(Skipping stage Download artifacts)
             standardReleasePipelineWithGenericTrigger.stage(Release, groovy.lang.Closure)

diff --git a/tests/jenkins/jobs/StandardReleasePipeline_JenkinsFile.txt b/tests/jenkins/jobs/StandardReleasePipeline_JenkinsFile.txt
@@ -2,7 +2,7 @@
       StandardReleasePipeline_JenkinsFile.standardReleasePipeline(groovy.lang.Closure)
          standardReleasePipeline.pipeline(groovy.lang.Closure)
             standardReleasePipeline.timeout({time=1, unit=HOURS})
-            standardReleasePipeline.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v1, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]])
+            standardReleasePipeline.echo(Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v4, reuseNode:false, stages:[:], args:, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]])
             standardReleasePipeline.stage(Release, groovy.lang.Closure)
                standardReleasePipeline.script(groovy.lang.Closure)
                   StandardReleasePipeline_JenkinsFile.echo(fakePublishToMaven [mavenArtifactsPath:/maven, autoPublish:true])

diff --git a/vars/standardReleasePipeline.groovy b/vars/standardReleasePipeline.groovy
@@ -20,7 +20,7 @@ void call(Map args = [:], Closure body) {
         {
             docker {
                 label args.overrideAgent ?: 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host'
-                image args.overrideDockerImage ?: 'opensearchstaging/ci-runner:release-centos7-clients-v1'
+                image args.overrideDockerImage ?: 'opensearchstaging/ci-runner:release-centos7-clients-v4'
                 alwaysPull true
             }
         }

diff --git a/vars/standardReleasePipelineWithGenericTrigger.groovy b/vars/standardReleasePipelineWithGenericTrigger.groovy
@@ -28,7 +28,7 @@ void call(Map arguments = [:], Closure body) {
         {
             docker {
                 label arguments.overrideAgent ?: 'Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host'
-                image arguments.overrideDockerImage ?: 'opensearchstaging/ci-runner:release-centos7-clients-v1'
+                image arguments.overrideDockerImage ?: 'opensearchstaging/ci-runner:release-centos7-clients-v4'
                 args arguments.overrideDockerArgs ?: '-e JAVA_HOME=/opt/java/openjdk-11'
                 alwaysPull true
             }
-Original file line number
+Diff line change
@@ Expand Up @@
             }
             assertThat(echoCommand.size(), equalTo(1))
-            assertThat(echoCommand, hasItem('Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v1, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]'))
+            assertThat(echoCommand, hasItem('Executing on agent [docker:[image:opensearchstaging/ci-runner:release-centos7-clients-v4, reuseNode:false, stages:[:], args:-e JAVA_HOME=/opt/java/openjdk-11, alwaysPull:true, containerPerStageRoot:false, label:Jenkins-Agent-AL2-X64-C54xlarge-Docker-Host]]'))
         }
         @Test
@@ Expand Down @@