Skip to content

Commit

Permalink
Remove the period at the end of RPM metadata description. (#2045)
Browse files Browse the repository at this point in the history
Signed-off-by: Zelin Hao <zelinhao@amazon.com>
  • Loading branch information
zelinh authored Apr 27, 2022
1 parent cbe0f12 commit 2c2e4e4
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion scripts/pkg/build_templates/opensearch/opensearch.rpm.spec
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ExclusiveArch: %{_architecture}
AutoReqProv: no

%description
OpenSearch makes it easy to ingest, search, visualize, and analyze your data.
OpenSearch makes it easy to ingest, search, visualize, and analyze your data
For more information, see: https://opensearch.org/

%prep
Expand Down
4 changes: 2 additions & 2 deletions tests/jenkins/TestRpmMetaValidation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class TestRpmMetaValidation extends BuildPipelineTest {
def refMap = [Name:"opensearch", Version: "1.3.1", Architecture: "x64", Group: "Application/Internet",
License: "Apache-2.0", Relocations: "(not relocatable)", URL: "https://opensearch.org/",
Summary: "An open source distributed and RESTful search engine",
Description: "OpenSearch makes it easy to ingest, search, visualize, and analyze your data.\n" +
Description: "OpenSearch makes it easy to ingest, search, visualize, and analyze your data\n" +
"For more information, see: https://opensearch.org/"
]
this.registerLibTester(new RpmMetaValidationLibTester(rpmDistribution, refMap))
Expand All @@ -41,7 +41,7 @@ class TestRpmMetaValidation extends BuildPipelineTest {
"URL : https://opensearch.org/\n" +
"Summary : An open source distributed and RESTful search engine\n" +
"Description :\n" +
"OpenSearch makes it easy to ingest, search, visualize, and analyze your data.\n" +
"OpenSearch makes it easy to ingest, search, visualize, and analyze your data\n" +
"For more information, see: https://opensearch.org/"
helper.addShMock("rpm -qip $workspace/opensearch-1.3.1-linux-x64.rpm") { script ->
return [stdout: out, exitValue: 0]
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/TestRpmOpenSearchDistValidation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class TestRpmOpenSearchDistValidation extends BuildPipelineTest {
"URL : https://opensearch.org/\n" +
"Summary : An open source distributed and RESTful search engine\n" +
"Description :\n" +
"OpenSearch makes it easy to ingest, search, visualize, and analyze your data.\n" +
"OpenSearch makes it easy to ingest, search, visualize, and analyze your data\n" +
"For more information, see: https://opensearch.org/"
helper.addShMock("rpm -qip $workspace/opensearch-1.3.1-linux-x64.rpm") { script ->
return [stdout: out, exitValue: 0]
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/jobs/RpmMetaValidation_Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pipeline {
refMap: [Name:"opensearch", Version: "1.3.1", Architecture: "x64", Group: "Application/Internet",
License: "Apache-2.0", Relocations: "(not relocatable)", URL: "https://opensearch.org/",
Summary: "An open source distributed and RESTful search engine",
Description: "OpenSearch makes it easy to ingest, search, visualize, and analyze your data.\n" +
Description: "OpenSearch makes it easy to ingest, search, visualize, and analyze your data\n" +
"For more information, see: https://opensearch.org/"
],
rpmDistribution: "/tmp/workspace/opensearch-1.3.1-linux-x64.rpm"
Expand Down
2 changes: 1 addition & 1 deletion tests/jenkins/jobs/RpmMetaValidation_Jenkinsfile.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
RpmMetaValidation_Jenkinsfile.echo(Executing on agent [label:none])
RpmMetaValidation_Jenkinsfile.stage(validate RPM meta, groovy.lang.Closure)
RpmMetaValidation_Jenkinsfile.script(groovy.lang.Closure)
RpmMetaValidation_Jenkinsfile.rpmMetaValidation({refMap={Name=opensearch, Version=1.3.1, Architecture=x64, Group=Application/Internet, License=Apache-2.0, Relocations=(not relocatable), URL=https://opensearch.org/, Summary=An open source distributed and RESTful search engine, Description=OpenSearch makes it easy to ingest, search, visualize, and analyze your data.
RpmMetaValidation_Jenkinsfile.rpmMetaValidation({refMap={Name=opensearch, Version=1.3.1, Architecture=x64, Group=Application/Internet, License=Apache-2.0, Relocations=(not relocatable), URL=https://opensearch.org/, Summary=An open source distributed and RESTful search engine, Description=OpenSearch makes it easy to ingest, search, visualize, and analyze your data
For more information, see: https://opensearch.org/}, rpmDistribution=/tmp/workspace/opensearch-1.3.1-linux-x64.rpm})
rpmMetaValidation.sh({script=rpm -qip /tmp/workspace/opensearch-1.3.1-linux-x64.rpm, returnStdout=true})
rpmMetaValidation.println(Meta data for Name is validated)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
rpmOpenSearchDistValidation.readYaml({file=tests/jenkins/data/opensearch-1.3.1-x64-rpm.yml})
BundleManifest.asBoolean()
BundleManifest.getNames()
rpmOpenSearchDistValidation.rpmMetaValidation({rpmDistribution=/tmp/workspace/opensearch-1.3.1-linux-x64.rpm, refMap={Name=opensearch, Version=1.3.1, Architecture=x64, Group=Application/Internet, License=Apache-2.0, Relocations=(not relocatable), URL=https://opensearch.org/, Summary=An open source distributed and RESTful search engine, Description=OpenSearch makes it easy to ingest, search, visualize, and analyze your data.
rpmOpenSearchDistValidation.rpmMetaValidation({rpmDistribution=/tmp/workspace/opensearch-1.3.1-linux-x64.rpm, refMap={Name=opensearch, Version=1.3.1, Architecture=x64, Group=Application/Internet, License=Apache-2.0, Relocations=(not relocatable), URL=https://opensearch.org/, Summary=An open source distributed and RESTful search engine, Description=OpenSearch makes it easy to ingest, search, visualize, and analyze your data
For more information, see: https://opensearch.org/}})
rpmMetaValidation.sh({script=rpm -qip /tmp/workspace/opensearch-1.3.1-linux-x64.rpm, returnStdout=true})
rpmMetaValidation.println(Meta data for Name is validated)
Expand Down
2 changes: 1 addition & 1 deletion vars/rpmOpenSearchDistValidation.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def call(Map args = [:]) {
refMap['URL'] = "https://opensearch.org/"
// The context the meta data should be for OpenSearch
refMap['Summary'] = "An open source distributed and RESTful search engine"
refMap['Description'] = "OpenSearch makes it easy to ingest, search, visualize, and analyze your data.\n" +
refMap['Description'] = "OpenSearch makes it easy to ingest, search, visualize, and analyze your data\n" +
"For more information, see: https://opensearch.org/"

rpmMetaValidation(
Expand Down

0 comments on commit 2c2e4e4

Please sign in to comment.