honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[TEST] Fix failing packaging tests for OpenSearch distributions. (#541) 

While creating the archives and packages, the build tries to copy the non-existent file `README.asciidoc` instead of `README.md`. Consequently, the packaging tests fail during verification time. This commit addresses the issue by fixing the name.

Signed-off-by: Rabi Panda <adnapibar@gmail.com>
This commit is contained in:
Rabi Panda 2021-04-14 07:02:25 -07:00 committed by GitHub
parent ff02542c8b
commit 0a66f9ace1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
distribution/archives/build.gradle
View File

@ -66,7 +66,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
}
}
from(rootProject.projectDir) {
include 'README.asciidoc'
include 'README.md'
}
from(rootProject.file('licenses')) {
include 'APACHE-LICENSE-2.0.txt'

2
distribution/packages/build.gradle
View File

@ -154,7 +154,7 @@ Closure commonPackageConfig(String type, boolean jdk, String architecture) {
with binFiles(type, jdk)
}
from(rootProject.projectDir) {
include 'README.asciidoc'
include 'README.md'
fileMode 0644
}
into('lib') {

2
qa/os/src/test/java/org/opensearch/packaging/util/Archives.java
View File

@ -200,7 +200,7 @@ public class Archives {
Stream.of("opensearch.yml", "jvm.options", "log4j2.properties")
.forEach(configFile -> assertThat(es.config(configFile), file(File, owner, owner, p660)));
Stream.of("NOTICE.txt", "LICENSE.txt", "README.asciidoc")
Stream.of("NOTICE.txt", "LICENSE.txt", "README.md")
.forEach(doc -> assertThat(es.home.resolve(doc), file(File, owner, owner, p644)));
}

2
qa/os/src/test/java/org/opensearch/packaging/util/Docker.java
View File

@ -528,7 +528,7 @@ public class Docker {
"opensearch-node"
).forEach(executable -> assertPermissionsAndOwnership(es.bin(executable), p755));
Stream.of("LICENSE.txt", "NOTICE.txt", "README.asciidoc").forEach(doc -> assertPermissionsAndOwnership(es.home.resolve(doc), p644));
Stream.of("LICENSE.txt", "NOTICE.txt", "README.md").forEach(doc -> assertPermissionsAndOwnership(es.home.resolve(doc), p644));
// These are installed to help users who are working with certificates.
Stream.of("zip", "unzip").forEach(cliPackage -> {

3
qa/os/src/test/java/org/opensearch/packaging/util/Packages.java
View File

@ -209,8 +209,7 @@ public class Packages {
Stream.of("opensearch", "opensearch-plugin", "opensearch-keystore", "opensearch-shard", "opensearch-shard")
.forEach(executable -> assertThat(opensearch.bin(executable), file(File, "root", "root", p755)));
Stream.of("NOTICE.txt", "README.asciidoc")
.forEach(doc -> assertThat(opensearch.home.resolve(doc), file(File, "root", "root", p644)));
Stream.of("NOTICE.txt", "README.md").forEach(doc -> assertThat(opensearch.home.resolve(doc), file(File, "root", "root", p644)));
assertThat(opensearch.envFile, file(File, "root", "opensearch", p660));