From d9044c71b331373358be62236336fe5290229528 Mon Sep 17 00:00:00 2001 From: jaymode Date: Tue, 28 Aug 2018 08:40:07 -0600 Subject: [PATCH] Test: fix token bwc tests due to bad backport This change fixes the token bwc tests that started failing after a bad backport of #33106. During merge conflict resolution, an additional if statement was added that used the incorrect passphrase in the keystore, which caused token validation to fail. This if statement has been removed in this commit. Closes #33197 --- x-pack/qa/rolling-upgrade/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/x-pack/qa/rolling-upgrade/build.gradle b/x-pack/qa/rolling-upgrade/build.gradle index 143f767e7641a..a9e0e36112d14 100644 --- a/x-pack/qa/rolling-upgrade/build.gradle +++ b/x-pack/qa/rolling-upgrade/build.gradle @@ -215,9 +215,6 @@ subprojects { setting 'xpack.watcher.encrypt_sensitive_data', 'true' keystoreFile 'xpack.watcher.encryption_key', "${mainProject.projectDir}/src/test/resources/system_key" } - if (version.before('6.0.0')) { - keystoreSetting 'xpack.security.authc.token.passphrase', 'token passphrase' - } } }