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.

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

Fix and unmute package upgrade tests #83043

Merged
merged 8 commits into from
Jan 27, 2022
Merged

Conversation

jkakavas
Copy link
Member

@jkakavas jkakavas commented Jan 25, 2022

Fixes package upgrade tests and unmutes failing tests

resolves: #79950, #76283

@jkakavas jkakavas added the :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts label Jan 25, 2022
@jkakavas
Copy link
Member Author

@elasticsearchmachine run elasticsearch-ci/packaging-upgrade-tests

@jkakavas jkakavas changed the title Unmute tests to investigate failures in CI Fix and unmute package upgrade tests Jan 26, 2022
@jkakavas jkakavas requested a review from mark-vieira January 26, 2022 12:52
@jkakavas jkakavas added >test Issues or PRs that are addressing/adding tests v8.0.0 labels Jan 26, 2022
@jkakavas jkakavas marked this pull request as ready for review January 26, 2022 12:52
@elasticmachine elasticmachine added the Team:Delivery Meta label for Delivery team label Jan 26, 2022
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@@ -75,15 +75,13 @@ public void test10SecurityAutoConfiguredOnPackageInstall() throws Exception {
public void test20SecurityNotAutoConfiguredOnReInstallation() throws Exception {
// we are testing force upgrading in the current version
// In such a case, security remains configured from the initial installation, we don't run it again.
Optional<String> autoConfigDirName = getAutoConfigDirName(installation);
byte[] transportKeystore = Files.readAllBytes(installation.config("certs").resolve("transport.p12"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we be using AUTOCONFIG_DIRNAME instead of "certs" here?

assertThat(getAutoConfigDirName(installation).isPresent(), is(true));
assertThat(getAutoConfigDirName(installation).get(), equalTo(autoConfigDirName.get()));
// Since we did not auto-configure the second time, the keystore should be the one we generated the first time, above
assertThat(transportKeystore, equalTo(Files.readAllBytes(installation.config("certs").resolve("transport.p12"))));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again, should we be using AUTOCONFIG_DIRNAME instead of "certs" here?

@jkakavas
Copy link
Member Author

a

@cla-checker-service
Copy link

cla-checker-service bot commented Jan 26, 2022

💚 CLA has been signed

@jkakavas jkakavas merged commit 514bec1 into elastic:master Jan 27, 2022
@jkakavas jkakavas added the auto-backport Automatically create backport pull requests when merged label Jan 27, 2022
jkakavas added a commit to jkakavas/elasticsearch that referenced this pull request Jan 27, 2022
Fixes PackageUpgradeTests

(cherry picked from commit 514bec1)
@jkakavas
Copy link
Member Author

💚 All backports created successfully

Status Branch Result
8.0

Questions ?

Please refer to the Backport tool documentation

jkakavas added a commit that referenced this pull request Jan 31, 2022
Fixes PackageUpgradeTests

(cherry picked from commit 514bec1)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-backport Automatically create backport pull requests when merged :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts Team:Delivery Meta label for Delivery team >test Issues or PRs that are addressing/adding tests v8.0.0 v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CI] PackageUpgradeTests test20InstallUpgradedVersion failing
4 participants