Merge branch 'main' into sharedux/cleanup-tomountpoint-deprecations-x…

…ii-threatintelligence
elastic · May 6, 2024 · ecb7fcd · ecb7fcd
2 parents 14ae3bb + b7057ce
commit ecb7fcd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/.buildkite/pipeline-resource-definitions/kibana-es-serverless-snapshots.yml b/.buildkite/pipeline-resource-definitions/kibana-es-serverless-snapshots.yml
@@ -20,7 +20,7 @@ spec:
     spec:
       env:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
-        ES_SERVERLESS_IMAGE: latest
+        ES_SERVERLESS_IMAGE: docker.elastic.co/elasticsearch-ci/elasticsearch-serverless:latest
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
       allow_rebuilds: true

diff --git a/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml b/.buildkite/pipelines/es_serverless/verify_es_serverless_image.yml
@@ -17,8 +17,15 @@ agents:
 steps:
   - label: "Annotate runtime parameters"
     command: |
-      buildkite-agent annotate --context es-serverless-image --style info "ES Serverless image: $ES_SERVERLESS_IMAGE"
       buildkite-agent annotate --context kibana-commit --style info "Kibana build hash: $BUILDKITE_BRANCH / $BUILDKITE_COMMIT"
+      cat << EOF | buildkite-agent annotate --context es-serverless-image --style info
+        ES Serverless image: \`$ES_SERVERLESS_IMAGE\`
+
+        To run this locally:
+        \`\`\`
+        node scripts/es serverless --image $ES_SERVERLESS_IMAGE
+        \`\`\`
+      EOF
 
   - group: "(:kibana: x :elastic:) Trigger Kibana Serverless suite"
     if: "build.env('SKIP_VERIFICATION') != '1' && build.env('SKIP_VERIFICATION') != 'true'"

diff --git a/x-pack/performance/journeys_e2e/tags_listing_page.ts b/x-pack/performance/journeys_e2e/tags_listing_page.ts
@@ -14,6 +14,8 @@ const TAG_DESCRIPTION = 'test description';
 export const journey = new Journey({
   esArchives: ['x-pack/performance/es_archives/sample_data_flights'],
   kbnArchives: ['x-pack/performance/kbn_archives/many_tags_and_visualizations'],
+  // FLAKY: https://github.com/elastic/kibana/issues/181546
+  skipped: true,
 })
   .step('Go to Tags Page', async ({ page, kbnUrl }) => {
     await page.goto(kbnUrl.get(`/app/management/kibana/tags`));