Skip to content

Commit 7d529ce

Browse files
authored
Handle renaming the README (#50404)
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.
1 parent 362ce41 commit 7d529ce

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

distribution/archives/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ CopySpec archiveFiles(CopySpec modulesFiles, String distributionType, String pla
7777
}
7878
}
7979
from(rootProject.projectDir) {
80-
include 'README.textile'
80+
include 'README.asciidoc'
8181
}
8282
from(rootProject.file('licenses')) {
8383
include oss ? 'APACHE-LICENSE-2.0.txt' : 'ELASTIC-LICENSE.txt'

qa/os/bats/utils/packages.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ verify_package_installation() {
136136
assert_file "$ESPLUGINS" d root root 755
137137
assert_file "$ESMODULES" d root root 755
138138
assert_file "$ESHOME/NOTICE.txt" f root root 644
139-
assert_file "$ESHOME/README.textile" f root root 644
139+
assert_file "$ESHOME/README.asciidoc" f root root 644
140140

141141
if is_dpkg; then
142142
# Env file

qa/os/bats/utils/tar.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ verify_archive_installation() {
105105
assert_file "$ESHOME/logs" d elasticsearch elasticsearch 755
106106
assert_file "$ESHOME/NOTICE.txt" f elasticsearch elasticsearch 644
107107
assert_file "$ESHOME/LICENSE.txt" f elasticsearch elasticsearch 644
108-
assert_file "$ESHOME/README.textile" f elasticsearch elasticsearch 644
108+
assert_file "$ESHOME/README.asciidoc" f elasticsearch elasticsearch 644
109109
assert_file_not_exist "$ESCONFIG/elasticsearch.keystore"
110110
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ private static void verifyOssInstallation(Installation es, Distribution distribu
204204
Stream.of(
205205
"NOTICE.txt",
206206
"LICENSE.txt",
207-
"README.textile"
207+
"README.asciidoc"
208208
).forEach(doc -> assertThat(es.home.resolve(doc), file(File, owner, owner, p644)));
209209
}
210210

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ private static void verifyOssInstallation(Installation es) {
445445
"elasticsearch-shard"
446446
).forEach(executable -> assertPermissionsAndOwnership(es.bin(executable), p755));
447447

448-
Stream.of("LICENSE.txt", "NOTICE.txt", "README.textile").forEach(doc -> assertPermissionsAndOwnership(es.home.resolve(doc), p644));
448+
Stream.of("LICENSE.txt", "NOTICE.txt", "README.asciidoc").forEach(doc -> assertPermissionsAndOwnership(es.home.resolve(doc), p644));
449449

450450
// These are installed to help users who are working with certificates.
451451
Stream.of("zip", "unzip").forEach(cliPackage -> {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ private static void verifyOssInstallation(Installation es, Distribution distribu
207207

208208
Stream.of(
209209
"NOTICE.txt",
210-
"README.textile"
210+
"README.asciidoc"
211211
).forEach(doc -> assertThat(es.home.resolve(doc), file(File, "root", "root", p644)));
212212

213213
assertThat(es.envFile, file(File, "root", "elasticsearch", p660));

0 commit comments

Comments
 (0)