Fix the hardcoded query string bug for closeBuildSuccessGithubIssue (#…

…3829) Signed-off-by: Prudhvi Godithi <[email protected]>
opensearch-project · Jul 29, 2023 · 885e029 · 885e029
1 parent 73e926e
commit 885e029
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 30 deletions.
diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -1,4 +1,4 @@
-lib = library(identifier: '[email protected].0', retriever: modernSCM([
+lib = library(identifier: '[email protected].1', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))
@@ -860,6 +860,7 @@ pipeline {
                     archiveArtifacts artifacts: 'buildInfo.yml'
                     closeBuildSuccessGithubIssue(
                         message: buildMessage(search: 'Successfully built'),
+                        search: "Successfully built",
                         inputManifestPath: "manifests/$INPUT_MANIFEST"
                     )
                     postCleanup()

diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -1,4 +1,4 @@
-lib = library(identifier: '[email protected].0', retriever: modernSCM([
+lib = library(identifier: '[email protected].1', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/jenkins/opensearch/distribution-build.jenkinsfile b/jenkins/opensearch/distribution-build.jenkinsfile
@@ -1,4 +1,4 @@
-lib = library(identifier: '[email protected].0', retriever: modernSCM([
+lib = library(identifier: '[email protected].1', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))
@@ -912,6 +912,7 @@ pipeline {
                     archiveArtifacts artifacts: 'buildInfo.yml'
                     closeBuildSuccessGithubIssue(
                         message: buildMessage(search: 'Successfully built'),
+                        search: "Successfully built",
                         inputManifestPath: "manifests/$INPUT_MANIFEST"
                     )
                     postCleanup()

diff --git a/jenkins/opensearch/integ-test.jenkinsfile b/jenkins/opensearch/integ-test.jenkinsfile
@@ -1,4 +1,4 @@
-lib = library(identifier: '[email protected].0', retriever: modernSCM([
+lib = library(identifier: '[email protected].1', retriever: modernSCM([
     $class: 'GitSCMSource',
     remote: 'https://github.com/opensearch-project/opensearch-build-libraries.git',
 ]))

diff --git a/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy b/tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy
@@ -24,7 +24,7 @@ class TestOpenSearchDashboardsIntegTest extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('5.4.0')
+                .defaultVersion('5.4.1')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')

diff --git a/tests/jenkins/TestOpenSearchIntegTest.groovy b/tests/jenkins/TestOpenSearchIntegTest.groovy
@@ -23,7 +23,7 @@ class TestOpenSearchIntegTest extends BuildPipelineTest {
 
         helper.registerSharedLibrary(
             library().name('jenkins')
-                .defaultVersion('5.4.0')
+                .defaultVersion('5.4.1')
                 .allowOverride(true)
                 .implicit(true)
                 .targetPath('vars')

diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt
diff --git a/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt
@@ -1,6 +1,6 @@
    integ-test.run()
       integ-test.modernSCM({$class=GitSCMSource, remote=https://github.com/opensearch-project/opensearch-build-libraries.git})
-      integ-test.library({[email protected].0, retriever=null})
+      integ-test.library({[email protected].1, retriever=null})
       integ-test.pipeline(groovy.lang.Closure)
          integ-test.credentials(jenkins-artifact-bucket-name)
          integ-test.timeout({time=4, unit=HOURS})
@@ -11,7 +11,7 @@
                integ-test.fileExists(manifests/tests/jenkins/data/opensearch-1.3.0-test.yml)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/717/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-1.3.0-build.yml})
                   downloadBuildManifest.legacySCM(groovy.lang.Closure)
-                  downloadBuildManifest.library({[email protected].0, retriever=null})
+                  downloadBuildManifest.library({[email protected].1, retriever=null})
                   downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/717/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-1.3.0-build.yml)
                   downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-1.3.0-build.yml})
                   BuildManifest.asBoolean()
@@ -30,7 +30,7 @@
             integ-test.script(groovy.lang.Closure)
                integ-test.downloadBuildManifest({url=https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/717/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz, path=tests/jenkins/data/opensearch-1.3.0-build.yml})
                   downloadBuildManifest.legacySCM(groovy.lang.Closure)
-                  downloadBuildManifest.library({[email protected].0, retriever=null})
+                  downloadBuildManifest.library({[email protected].1, retriever=null})
                   downloadBuildManifest.sh(curl -sSL https://ci.opensearch.org/ci/dbc/distribution-build-opensearch/1.3.0/717/linux/x64/dist/opensearch/opensearch-1.3.0-linux-x64.tar.gz --output tests/jenkins/data/opensearch-1.3.0-build.yml)
                   downloadBuildManifest.readYaml({file=tests/jenkins/data/opensearch-1.3.0-build.yml})
                   BuildManifest.asBoolean()
@@ -56,14 +56,14 @@
                         integ-test.sh(rm -rf test-results)
                         integ-test.runIntegTestScript({jobName=distribution-build-opensearch, componentName=OpenSearch, buildManifest=tests/jenkins/data/opensearch-1.3.0-build.yml, testManifest=manifests/tests/jenkins/data/opensearch-1.3.0-test.yml, localPath=/tmp/workspace/tar, switchUserNonRoot=false})
                            runIntegTestScript.legacySCM(groovy.lang.Closure)
-                           runIntegTestScript.library({[email protected].0, retriever=null})
+                           runIntegTestScript.library({[email protected].1, retriever=null})
                            runIntegTestScript.readYaml({file=tests/jenkins/data/opensearch-1.3.0-build.yml})
                            BuildManifest.asBoolean()
                            BuildManifest.getDistribution()
                            runIntegTestScript.echo(Start integTest for distribution type: tar)
                            runIntegTestScript.detectTestDockerAgent({testManifest=manifests/tests/jenkins/data/opensearch-1.3.0-test.yml})
                               detectTestDockerAgent.legacySCM(groovy.lang.Closure)
-                              detectTestDockerAgent.library({[email protected].0, retriever=null})
+                              detectTestDockerAgent.library({[email protected].1, retriever=null})
                               detectTestDockerAgent.readYaml({file=manifests/tests/jenkins/data/opensearch-1.3.0-test.yml})
                               TestManifest.asBoolean()
                               detectTestDockerAgent.echo(Using Docker image opensearchstaging/ci-runner:ci-runner-centos7-v1 (null))
@@ -89,7 +89,7 @@ ccc -R opensearch-project/OpenSearch --comment "Closing the issue as the Integra
                         integ-test.echo(Completed running integtest for component OpenSearch)
                         integ-test.uploadTestResults({buildManifestFileName=tests/jenkins/data/opensearch-1.3.0-build.yml, jobName=dummy_job})
                            uploadTestResults.legacySCM(groovy.lang.Closure)
-                           uploadTestResults.library({[email protected].0, retriever=null})
+                           uploadTestResults.library({[email protected].1, retriever=null})
                            uploadTestResults.readYaml({file=tests/jenkins/data/opensearch-1.3.0-build.yml})
                            BuildManifest.asBoolean()
                            uploadTestResults.echo(Build Id: 717)