Bring over changes from master

elastic · Nov 18, 2020 · 5cc240d · 5cc240d
1 parent 08c6543
commit 5cc240d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/.ci/teamcity/default/build.sh b/.ci/teamcity/default/build.sh
@@ -7,6 +7,7 @@ source "$(dirname "${0}")/../util.sh"
 tc_start_block "Build Platform Plugins"
 node scripts/build_kibana_platform_plugins \
   --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
+  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_functional/plugins" \
   --scan-dir "$XPACK_DIR/test/functional_with_es_ssl/fixtures/plugins" \
   --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \

diff --git a/.ci/teamcity/default/build_plugins.sh b/.ci/teamcity/default/build_plugins.sh
@@ -7,6 +7,7 @@ source "$(dirname "${0}")/../util.sh"
 tc_start_block "Build Platform Plugins"
 node scripts/build_kibana_platform_plugins \
   --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
+  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
   --scan-dir "$XPACK_DIR/test/plugin_functional/plugins" \
   --scan-dir "$XPACK_DIR/test/functional_with_es_ssl/fixtures/plugins" \
   --scan-dir "$XPACK_DIR/test/alerting_api_integration/plugins" \

diff --git a/.ci/teamcity/oss/build.sh b/.ci/teamcity/oss/build.sh
@@ -10,6 +10,7 @@ node scripts/build_kibana_platform_plugins \
   --filter '!alertingExample' \
   --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
   --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
+  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
   --verbose
 tc_end_block "Build Platform Plugins"
 

diff --git a/.ci/teamcity/oss/build_plugins.sh b/.ci/teamcity/oss/build_plugins.sh
@@ -11,5 +11,6 @@ node scripts/build_kibana_platform_plugins \
   --filter '!alertingExample' \
   --scan-dir "$KIBANA_DIR/test/plugin_functional/plugins" \
   --scan-dir "$KIBANA_DIR/test/interpreter_functional/plugins" \
+  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
   --verbose
 tc_end_block "Build Platform Plugins - OSS"