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

Handle renaming the README (#50404) (#50406) 

We renamed README.textile to README.asciidoc but a bunch of tests and
the package build itself still pointed at the old name. This switches
them the new name.
This commit is contained in:
Nik Everett 2019-12-19 18:55:38 -05:00 committed by GitHub
parent 2e76865290
commit 878852352d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 6 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

@ -79,7 +79,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
}
}
from(rootProject.projectDir) {
include 'README.textile'
include 'README.asciidoc'
}
from(rootProject.file('licenses')) {
include oss ? 'APACHE-LICENSE-2.0.txt' : 'ELASTIC-LICENSE.txt'

2
qa/os/bats/utils/packages.bash
View File

@ -136,7 +136,7 @@ verify_package_installation() {
assert_file "$ESPLUGINS" d root root 755
assert_file "$ESMODULES" d root root 755
assert_file "$ESHOME/NOTICE.txt" f root root 644
assert_file "$ESHOME/README.textile" f root root 644
assert_file "$ESHOME/README.asciidoc" f root root 644
if is_dpkg; then
# Env file

2
qa/os/bats/utils/tar.bash
View File

@ -105,6 +105,6 @@ verify_archive_installation() {
assert_file "$ESHOME/logs" d elasticsearch elasticsearch 755
assert_file "$ESHOME/NOTICE.txt" f elasticsearch elasticsearch 644
assert_file "$ESHOME/LICENSE.txt" f elasticsearch elasticsearch 644
assert_file "$ESHOME/README.textile" f elasticsearch elasticsearch 644
assert_file "$ESHOME/README.asciidoc" f elasticsearch elasticsearch 644
assert_file_not_exist "$ESCONFIG/elasticsearch.keystore"
}

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

@ -204,7 +204,7 @@ public class Archives {
Stream.of(
"NOTICE.txt",
"LICENSE.txt",
"README.textile"
"README.asciidoc"
).forEach(doc -> assertThat(es.home.resolve(doc), file(File, owner, owner, p644)));
}

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

@ -445,7 +445,7 @@ public class Docker {
"elasticsearch-shard"
).forEach(executable -> assertPermissionsAndOwnership(es.bin(executable), p755));
Stream.of("LICENSE.txt", "NOTICE.txt", "README.textile").forEach(doc -> assertPermissionsAndOwnership(es.home.resolve(doc), p644));
Stream.of("LICENSE.txt", "NOTICE.txt", "README.asciidoc").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 -> {

2
qa/os/src/test/java/org/elasticsearch/packaging/util/Packages.java
View File

@ -206,7 +206,7 @@ public class Packages {
Stream.of(
"NOTICE.txt",
"README.textile"
"README.asciidoc"
).forEach(doc -> assertThat(es.home.resolve(doc), file(File, "root", "root", p644)));
assertThat(es.envFile, file(File, "root", "elasticsearch", p660));