Skip to content

Commit

Permalink
[7.17] Skip test due to unavailable resource (#195330) (#195340)
Browse files Browse the repository at this point in the history
# Backport

This will backport the following commits from `main` to `7.17`:
- [Skip test due to unavailable resource
(#195330)](#195330)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Tim
Sullivan","email":"tsullivan@users.noreply.github.com"},"sourceCommit":{"committedDate":"2024-10-08T00:38:56Z","message":"Skip
test due to unavailable resource
(#195330)","sha":"c215f583680a11e6c73614ee802a2b8af2ee7351","branchLabelMapping":{"^v9.0.0$":"main","^v8.16.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:version","v7.17.25"],"title":"Skip
test due to unavailable
resource","number":195330,"url":"https://github.com/elastic/kibana/pull/195330","mergeCommit":{"message":"Skip
test due to unavailable resource
(#195330)","sha":"c215f583680a11e6c73614ee802a2b8af2ee7351"}},"sourceBranch":"main","suggestedTargetBranches":["7.17"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/195330","number":195330,"mergeCommit":{"message":"Skip
test due to unavailable resource
(#195330)","sha":"c215f583680a11e6c73614ee802a2b8af2ee7351"}},{"branch":"7.17","label":"v7.17.25","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"url":"https://github.com/elastic/kibana/pull/195335","number":195335,"branch":"8.15","state":"MERGED","mergeCommit":{"sha":"dbebd6a7012d6cc2cd20f94dc0954f57bf85dff6","message":"[8.15]
Skip test due to unavailable resource (#195330) (#195335)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.15`:\n- [Skip test due to unavailable
resource\n(#195330)](https://github.com/elastic/kibana/pull/195330)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Tim\nSullivan\",\"email\":\"tsullivan@users.noreply.github.com\"},\"sourceCommit\":{\"committedDate\":\"2024-10-08T00:38:56Z\",\"message\":\"Skip\ntest
due to unavailable
resource\n(#195330)\",\"sha\":\"c215f583680a11e6c73614ee802a2b8af2ee7351\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.16.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"v9.0.0\",\"v8.16.0\",\"backport:version\",\"v8.15.3\"],\"title\":\"Skip\ntest
due to
unavailable\nresource\",\"number\":195330,\"url\":\"https://github.com/elastic/kibana/pull/195330\",\"mergeCommit\":{\"message\":\"Skip\ntest
due to unavailable
resource\n(#195330)\",\"sha\":\"c215f583680a11e6c73614ee802a2b8af2ee7351\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[\"8.x\",\"8.15\"],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/195330\",\"number\":195330,\"mergeCommit\":{\"message\":\"Skip\ntest
due to unavailable
resource\n(#195330)\",\"sha\":\"c215f583680a11e6c73614ee802a2b8af2ee7351\"}},{\"branch\":\"8.x\",\"label\":\"v8.16.0\",\"branchLabelMappingKey\":\"^v8.16.0$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"},{\"branch\":\"8.15\",\"label\":\"v8.15.3\",\"branchLabelMappingKey\":\"^v(\\\\d+).(\\\\d+).\\\\d+$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"}]}]\nBACKPORT-->\n\nCo-authored-by:
Tim Sullivan
<tsullivan@users.noreply.github.com>"}},{"url":"https://github.com/elastic/kibana/pull/195336","number":195336,"branch":"8.x","state":"MERGED","mergeCommit":{"sha":"72b6f8619571ab4b1641b5cf73cd8a5e46892987","message":"[8.x]
Skip test due to unavailable resource (#195330) (#195336)\n\n#
Backport\n\nThis will backport the following commits from `main` to
`8.x`:\n- [Skip test due to unavailable
resource\n(#195330)](https://github.com/elastic/kibana/pull/195330)\n\n<!---
Backport version: 9.4.3 -->\n\n### Questions ?\nPlease refer to the
[Backport
tool\ndocumentation](https://github.com/sqren/backport)\n\n<!--BACKPORT
[{\"author\":{\"name\":\"Tim\nSullivan\",\"email\":\"tsullivan@users.noreply.github.com\"},\"sourceCommit\":{\"committedDate\":\"2024-10-08T00:38:56Z\",\"message\":\"Skip\ntest
due to unavailable
resource\n(#195330)\",\"sha\":\"c215f583680a11e6c73614ee802a2b8af2ee7351\",\"branchLabelMapping\":{\"^v9.0.0$\":\"main\",\"^v8.16.0$\":\"8.x\",\"^v(\\\\d+).(\\\\d+).\\\\d+$\":\"$1.$2\"}},\"sourcePullRequest\":{\"labels\":[\"release_note:skip\",\"v9.0.0\",\"v8.16.0\",\"backport:version\",\"v8.15.3\"],\"title\":\"Skip\ntest
due to
unavailable\nresource\",\"number\":195330,\"url\":\"https://github.com/elastic/kibana/pull/195330\",\"mergeCommit\":{\"message\":\"Skip\ntest
due to unavailable
resource\n(#195330)\",\"sha\":\"c215f583680a11e6c73614ee802a2b8af2ee7351\"}},\"sourceBranch\":\"main\",\"suggestedTargetBranches\":[\"8.x\",\"8.15\"],\"targetPullRequestStates\":[{\"branch\":\"main\",\"label\":\"v9.0.0\",\"branchLabelMappingKey\":\"^v9.0.0$\",\"isSourceBranch\":true,\"state\":\"MERGED\",\"url\":\"https://github.com/elastic/kibana/pull/195330\",\"number\":195330,\"mergeCommit\":{\"message\":\"Skip\ntest
due to unavailable
resource\n(#195330)\",\"sha\":\"c215f583680a11e6c73614ee802a2b8af2ee7351\"}},{\"branch\":\"8.x\",\"label\":\"v8.16.0\",\"branchLabelMappingKey\":\"^v8.16.0$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"},{\"branch\":\"8.15\",\"label\":\"v8.15.3\",\"branchLabelMappingKey\":\"^v(\\\\d+).(\\\\d+).\\\\d+$\",\"isSourceBranch\":false,\"state\":\"NOT_CREATED\"}]}]\nBACKPORT-->\n\nCo-authored-by:
Tim Sullivan <tsullivan@users.noreply.github.com>"}}]}] BACKPORT-->

Co-authored-by: Tim Sullivan <tsullivan@users.noreply.github.com>
  • Loading branch information
kibanamachine and tsullivan authored Oct 8, 2024
1 parent 1b83892 commit 79fed6f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 25 deletions.
27 changes: 3 additions & 24 deletions x-pack/test/licensing_plugin/scenario.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,30 +70,9 @@ export function createScenario({ getService, getPageObjects }: FtrProviderContex
expect(response.body.trial_was_started).to.be(true);
},

async startEnterprise() {
const response = await esSupertestWithoutAuth
.post('/_license/?acknowledge=true')
.send({
license: {
uid: '504430e6-503c-4316-85cb-b402c730ca08',
type: 'enterprise',
issue_date_in_millis: 1669680000000,
start_date_in_millis: 1669680000000,
// expires 2024-12-31
expiry_date_in_millis: 1735689599999,
max_resource_units: 250,
max_nodes: null,
issued_to: 'Elastic - INTERNAL (development environments)',
issuer: 'API',
signature:
'AAAABQAAAA2h1vBafHuRhjOHREKYAAAAIAo5/x6hrsGh1GqqrJmy4qgmEC7gK0U4zQ6q5ZEMhm4jAAABAByGz9MmRW/L7vQriISa6u8Oov7zykA+Cv55BToWEthSn0c5KQUxcWG+K5Cm4/OkFsXA8TE4zFnlSgYxmQi2Eqq7IAKGdcxI/xhQfMsq5RWlSEwtfyV0M2RKJxgam8o2lvKC9EbrU76ISYr7jTkgoBl6GFSjdfXMHmxNXBSKDDm03ZeXkWkvuNNFrHJuYivf2Se9OeeB/eu4jqUI0UuNfPYF07ZcYvtKfj3KX+aysCSV2FW8wgyAjndOPEinfYcwAJ09zcl+MTig2K0DQTsYkLykXmzZnLz6qeuVVFjCTowxizDFW+5MrpzUnwkjqv8CFhLfvxG7waWQWslv8fXLUn8=',
},
})
.auth('license_manager_user', 'license_manager_user-password')
.expect(200);

expect(response.body.license_status).to.be('valid');
},
// FIXME: enterprise license is not available for tests
// https://github.com/elastic/kibana/issues/53575
async startEnterprise() {},

async deleteLicense() {
const response = await esSupertestWithoutAuth
Expand Down
4 changes: 3 additions & 1 deletion x-pack/test/licensing_plugin/server/updates.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ export default function (ftrContext: FtrProviderContext) {
await testSubjects.missingOrFail('licenseExpiredBanner');
});

it('properly recognize an enterprise license', async () => {
// FIXME: enterprise license is not available for tests
// https://github.com/elastic/kibana/issues/53575
it.skip('properly recognize an enterprise license', async () => {
await scenario.startEnterprise();
await scenario.waitForPluginToDetectLicenseUpdate();

Expand Down

0 comments on commit 79fed6f

Please sign in to comment.