mirror of
https://github.com/elastic/kibana.git
synced 2025-06-28 03:01:21 -04:00
# Backport This will backport the following commits from `main` to `7.17`: - [Update enterprise test license, unskip tests (#215448)](https://github.com/elastic/kibana/pull/215448) <!--- Backport version: 9.6.6 --> ### Questions ? Please refer to the [Backport tool documentation](https://github.com/sorenlouv/backport) <!--BACKPORT [{"author":{"name":"Gerard Soldevila","email":"gerard.soldevila@elastic.co"},"sourceCommit":{"committedDate":"2025-03-25T10:41:40Z","message":"Update enterprise test license, unskip tests (#215448)\n\n## Summary\n\nAddresses https://github.com/elastic/kibana/issues/53575","sha":"2556b13d347cfe796c39760808700a0a9e0d52d7","branchLabelMapping":{"^v9.1.0$":"main","^v8.19.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["Team:Core","release_note:skip","backport:all-open","v9.1.0"],"title":"Update enterprise test license, unskip tests","number":215448,"url":"https://github.com/elastic/kibana/pull/215448","mergeCommit":{"message":"Update enterprise test license, unskip tests (#215448)\n\n## Summary\n\nAddresses https://github.com/elastic/kibana/issues/53575","sha":"2556b13d347cfe796c39760808700a0a9e0d52d7"}},"sourceBranch":"main","suggestedTargetBranches":[],"targetPullRequestStates":[{"branch":"main","label":"v9.1.0","branchLabelMappingKey":"^v9.1.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/215448","number":215448,"mergeCommit":{"message":"Update enterprise test license, unskip tests (#215448)\n\n## Summary\n\nAddresses https://github.com/elastic/kibana/issues/53575","sha":"2556b13d347cfe796c39760808700a0a9e0d52d7"}}]}] BACKPORT--> Co-authored-by: Gerard Soldevila <gerard.soldevila@elastic.co>
This commit is contained in:
parent
881f2d4a53
commit
ff151b693d
3 changed files with 26 additions and 8 deletions
|
@ -19,8 +19,7 @@ export default function (ftrContext: FtrProviderContext) {
|
||||||
|
|
||||||
const scenario = createScenario(ftrContext);
|
const scenario = createScenario(ftrContext);
|
||||||
|
|
||||||
// FLAKY: https://github.com/elastic/kibana/issues/53575
|
describe('changes in license types', () => {
|
||||||
describe.skip('changes in license types', () => {
|
|
||||||
after(async () => {
|
after(async () => {
|
||||||
await scenario.teardown();
|
await scenario.teardown();
|
||||||
});
|
});
|
||||||
|
|
|
@ -70,9 +70,30 @@ export function createScenario({ getService, getPageObjects }: FtrProviderContex
|
||||||
expect(response.body.trial_was_started).to.be(true);
|
expect(response.body.trial_was_started).to.be(true);
|
||||||
},
|
},
|
||||||
|
|
||||||
// FIXME: enterprise license is not available for tests
|
async startEnterprise() {
|
||||||
// https://github.com/elastic/kibana/issues/53575
|
const response = await esSupertestWithoutAuth
|
||||||
async startEnterprise() {},
|
.post('/_license/?acknowledge=true')
|
||||||
|
.send({
|
||||||
|
license: {
|
||||||
|
uid: '89e98f2b-c33e-4b86-b2fc-e2a9c50b7e48',
|
||||||
|
type: 'enterprise',
|
||||||
|
issue_date_in_millis: 1732060800000,
|
||||||
|
expiry_date_in_millis: 1798761599999,
|
||||||
|
max_nodes: null,
|
||||||
|
max_resource_units: 250,
|
||||||
|
issued_to:
|
||||||
|
'Elastic - INTERNAL (development environments) (non-production environments)',
|
||||||
|
issuer: 'API',
|
||||||
|
signature:
|
||||||
|
'AAAABQAAAA3qRa8oxcCGYexwpCR8AAAAIAo5/x6hrsGh1GqqrJmy4qgmEC7gK0U4zQ6q5ZEMhm4jAAABADNu1nLWe1tBP0/JMebh0StSAfu7pN/YtKi7IUG3dITPAWw63pMLyDUMSTkgR1FP4LOzPVYtYhliALt/ho/xBUsnjFfhEfTbdDwFrs70bzZ3U9nDsAvpZe6BjwSyuKpJTZW6Ebd2ZbZfZ3ZyuzPl8SNXUckSwd3TzrrmZzi7VD5vILMrgrAGJtlhzXirnLRoIA8hoRLzoHsMV/KiofmLLuWFP7YemdM2/l7KxJyz0HfdPhl89v/m3GumyX1QCmHOGNF0Vs1F6Rum79g4iZjGCp0SSOMQfQIaMMc0YgBIa5AdiuWQV5RtAYHxjZ4oidSADyVWnGQIAm9KLVhO3Y5HBGw=',
|
||||||
|
start_date_in_millis: 1732060800000,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.auth('license_manager_user', 'license_manager_user-password')
|
||||||
|
.expect(200);
|
||||||
|
|
||||||
|
expect(response.body.license_status).to.be('valid');
|
||||||
|
},
|
||||||
|
|
||||||
async deleteLicense() {
|
async deleteLicense() {
|
||||||
const response = await esSupertestWithoutAuth
|
const response = await esSupertestWithoutAuth
|
||||||
|
|
|
@ -65,9 +65,7 @@ export default function (ftrContext: FtrProviderContext) {
|
||||||
await testSubjects.missingOrFail('licenseExpiredBanner');
|
await testSubjects.missingOrFail('licenseExpiredBanner');
|
||||||
});
|
});
|
||||||
|
|
||||||
// FIXME: enterprise license is not available for tests
|
it('properly recognize an enterprise license', async () => {
|
||||||
// https://github.com/elastic/kibana/issues/53575
|
|
||||||
it.skip('properly recognize an enterprise license', async () => {
|
|
||||||
await scenario.startEnterprise();
|
await scenario.startEnterprise();
|
||||||
await scenario.waitForPluginToDetectLicenseUpdate();
|
await scenario.waitForPluginToDetectLicenseUpdate();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue