Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the hardcoded query string bug for closeBuildSuccessGithubIssue #3829

Merged
merged 1 commit into from
Jul 29, 2023
Merged

Fix the hardcoded query string bug for closeBuildSuccessGithubIssue #3829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion jenkins/opensearch-dashboards/distribution-build.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
]))
Expand Down Expand Up @@ -860,6 +860,7 @@ pipeline {
archiveArtifacts artifacts: 'buildInfo.yml'
closeBuildSuccessGithubIssue(
message: buildMessage(search: 'Successfully built'),
search: "Successfully built",
prudhvigodithi marked this conversation as resolved.
Show resolved Hide resolved
inputManifestPath: "manifests/$INPUT_MANIFEST"
)
postCleanup()
Expand Down
2 changes: 1 addition & 1 deletion jenkins/opensearch-dashboards/integ-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
]))
Expand Down
3 changes: 2 additions & 1 deletion jenkins/opensearch/distribution-build.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
]))
Expand Down Expand Up @@ -912,6 +912,7 @@ pipeline {
archiveArtifacts artifacts: 'buildInfo.yml'
closeBuildSuccessGithubIssue(
message: buildMessage(search: 'Successfully built'),
search: "Successfully built",
inputManifestPath: "manifests/$INPUT_MANIFEST"
)
postCleanup()
Expand Down
2 changes: 1 addition & 1 deletion jenkins/opensearch/integ-test.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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',
]))
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestOpenSearchDashboardsIntegTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestOpenSearchIntegTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
36 changes: 18 additions & 18 deletions tests/jenkins/jenkinsjob-regression-files/opensearch-dashboards/integ-test.jenkinsfile.txt
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions tests/jenkins/jenkinsjob-regression-files/opensearch/integ-test.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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})
Expand All @@ -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()
Expand All @@ -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()
Expand All @@ -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))
Expand All @@ -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)
Expand Down