Skip to content

Commit

Permalink
Merge branch 'main' into nodejs20
Browse files Browse the repository at this point in the history
  • Loading branch information
watson committed Nov 20, 2023
2 parents d4295b3 + c0978db commit 95f4965
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 15 deletions.
10 changes: 0 additions & 10 deletions .buildkite/pipelines/quality-gates/pipeline.tests-qa.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,3 @@ steps:
USE_GROUP_LABEL: true
agents:
image: "docker.elastic.co/ci-agent-images/manual-verification-agent:0.0.6"

- group: "Observability"
steps:
- label: ":judge::seedling: Trigger Manual Tests Phase - Observability"
command: "make -C /agent trigger-manual-verification-phase"
env:
NOTIFICATION_APPENDIX: "<!subteam^S896GM05A> please execute your manual testing plan."
USE_GROUP_LABEL: true
agents:
image: "docker.elastic.co/ci-agent-images/manual-verification-agent:0.0.6"
6 changes: 3 additions & 3 deletions .buildkite/pull_requests.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@
"repoName": "kibana",
"pipelineSlug": "kibana-kme-test",

"enabled": false,
"enabled": true,
"allow_org_users": true,
"allowed_repo_permissions": ["admin", "write"],
"allowed_list": ["barlowm", "renovate[bot]"],
"set_commit_status": true,
"commit_status_context": "kibana-ci",
"commit_status_context": "kibana-ci-test",
"build_on_commit": true,
"build_on_comment": true,
"build_on_comment": false,
"trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"always_trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
"skip_ci_labels": [],
Expand Down
2 changes: 1 addition & 1 deletion src/dev/build/lib/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,6 @@ export class Config {
}

getDistPluginsFromRepo() {
return getPackages(this.repoRoot).filter(this.pluginFilter);
return getPackages(this.repoRoot).filter((p) => !p.isDevOnly() && this.pluginFilter(p));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,15 @@
* Side Public License, v 1.
*/

import { PluginPackage } from '@kbn/repo-packages';
import { findUsedDependencies } from './find_used_dependencies';
import { read, write, Task } from '../../lib';

export const CreatePackageJson: Task = {
description: 'Creating build-ready version of package.json',

async run(config, log, build) {
const plugins = config.getDistPluginsFromRepo();
const plugins = config.getDistPluginsFromRepo() as PluginPackage[];
const distPkgIds = new Set(config.getDistPackagesFromRepo().map((p) => p.id));
const pkg = config.getKibanaPkg();

Expand Down

0 comments on commit 95f4965

Please sign in to comment.