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

Jump to bottom

Set explicit file permissions in NoticeTask #99206

Merged
merged 4 commits into from
Sep 5, 2023
Merged

Set explicit file permissions in NoticeTask #99206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
45a2154
Revert "Mute all tests in CertGenCliTests (#99192)"
brianseeders Sep 5, 2023
5812ea9
Revert "Mute failing test mute_CertGenCliTests/test10Install (#99171)"
brianseeders Sep 5, 2023
71281bb
Set explicit file permissions in NoticeTask
brianseeders Sep 5, 2023
dbdb673
Update file perms in distribution build instead
brianseeders Sep 5, 2023
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
4 changes: 3 additions & 1 deletion distribution/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ configure(subprojects.findAll { ['archives', 'packages'].contains(it.name) }) {
if (testDistro) {
from buildServerNoticeTaskProvider
} else {
from buildDefaultNoticeTaskProvider
from (buildDefaultNoticeTaskProvider) {
fileMode = 0644
}
}
}
}
Expand Down
5 changes: 0 additions & 5 deletions qa/os/src/test/java/org/elasticsearch/packaging/test/CertGenCliTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,17 @@ public static void cleanupFiles() {
FileUtils.rm(instancesFile, certificatesFile);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test10Install() throws Exception {
install();
// Disable security auto-configuration as we want to generate keys/certificates manually here
ServerUtils.disableSecurityAutoConfiguration(installation);
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test20Help() {
Shell.Result result = installation.executables().certgenTool.run("--help");
assertThat(result.stdout(), containsString("Simplifies certificate creation"));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test30Generate() throws Exception {
final List<String> lines = new ArrayList<>();
lines.add("instances:");
Expand All @@ -75,7 +72,6 @@ public void test30Generate() throws Exception {
assertThat(certificatesFile, file(File, owner, owner, p600));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test31ExtractCerts() throws Exception {
// windows 2012 r2 has powershell 4.0, which lacks Expand-Archive
assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2"));
Expand All @@ -94,7 +90,6 @@ public void test31ExtractCerts() throws Exception {
FileUtils.cp(certsDir, installation.config("certs"));
}

@AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/99153")
public void test40RunWithCert() throws Exception {
// windows 2012 r2 has powershell 4.0, which lacks Expand-Archive
assumeFalse(Platforms.OS_NAME.equals("Windows Server 2012 R2"));
Expand Down