Merge branch 'master' into persistablestate/docs

Author: kibanamachine

.backportrc.json

@@ -3,6 +3,7 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.15",
     "7.14",
     "7.13",
     "7.12",
@@ -32,7 +33,7 @@
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.15.0$": "7.x",
+    "^v7.16.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,

.buildkite/hooks/post-command

@@ -0,0 +1,8 @@
+{
+  "name": "kibana-buildkite",
+  "version": "1.0.0",
+  "private": true,
+  "dependencies": {
+    "kibana-buildkite-library": "elastic/kibana-buildkite-library"
+  }
+}

.buildkite/package.json

@@ -0,0 +1,17 @@
+env:
+  GITHUB_COMMIT_STATUS_ENABLED: 'true'
+  GITHUB_COMMIT_STATUS_CONTEXT: 'buildkite/kibana-pull-request'
+steps:
+  - command: .buildkite/scripts/lifecycle/pre_build.sh
+    label: Pre-Build
+
+  - wait
+
+  - command: echo 'Hello World'
+    label: Test
+
+  - wait: ~
+    continue_on_failure: true
+
+  - command: .buildkite/scripts/lifecycle/post_build.sh
+    label: Post-Build

.buildkite/pipelines/pull_request.yml

@@ -0,0 +1,8 @@
+steps:
+  - command: .buildkite/scripts/steps/demo_env/es_and_init.sh
+    label: Initialize Environment and Deploy ES
+
+  - command: .buildkite/scripts/steps/demo_env/kibana.sh
+    label: Build and Deploy Kibana
+    agents:
+      queue: c2-8

.buildkite/pipelines/update_demo_env.yml

@@ -70,3 +70,4 @@ export TEST_ES_URL="http://elastic:changeme@localhost:6102"
 export TEST_ES_TRANSPORT_PORT=6301-6309
 export TEST_CORS_SERVER_PORT=6106
 export ALERTING_PROXY_PORT=6105
+export TEST_PROXY_SERVER_PORT=6107

.buildkite/scripts/common/env.sh

@@ -0,0 +1,17 @@
+const { BuildkiteClient } = require('kibana-buildkite-library');
+
+(async () => {
+  try {
+    const client = new BuildkiteClient();
+    const status = await client.getCurrentBuildStatus();
+    console.log(status.success ? 'true' : 'false');
+    process.exit(0);
+  } catch (ex) {
+    if (ex.response) {
+      console.error('HTTP Error Response Body', ex.response.data);
+      console.error('HTTP Error Response Status', ex.response.status);
+    }
+    console.error(ex);
+    process.exit(1);
+  }
+})();

.buildkite/scripts/lifecycle/build_status.js

@@ -1,15 +1,8 @@
-const ciStats = require('./ci_stats');
-
-// TODO - this is okay for now but should really be replaced with an API call, especially once retries are enabled
-const BUILD_STATUS = process.env.BUILD_FAILED === 'true' ? 'FAILURE' : 'SUCCESS';
+const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {
   try {
-    if (process.env.CI_STATS_BUILD_ID) {
-      await ciStats.post(`/v1/build/_complete?id=${process.env.CI_STATS_BUILD_ID}`, {
-        result: BUILD_STATUS,
-      });
-    }
+    await CiStats.onComplete();
   } catch (ex) {
     console.error(ex);
     process.exit(1);

.buildkite/scripts/lifecycle/ci_stats.js

@@ -1,28 +1,8 @@
-const { execSync } = require('child_process');
-const ciStats = require('./ci_stats');
+const { CiStats } = require('kibana-buildkite-library');
 
 (async () => {
   try {
-    const build = await ciStats.post('/v1/build', {
-      jenkinsJobName: process.env.BUILDKITE_PIPELINE_NAME,
-      jenkinsJobId: process.env.BUILDKITE_BUILD_ID,
-      jenkinsUrl: process.env.BUILDKITE_BUILD_URL,
-      prId: process.env.GITHUB_PR_NUMBER || null,
-    });
-
-    execSync(`buildkite-agent meta-data set ci_stats_build_id "${build.id}"`);
-
-    // TODO Will need to set MERGE_BASE for PRs
-
-    await ciStats.post(`/v1/git_info?buildId=${build.id}`, {
-      branch: process.env.BUILDKITE_BRANCH.replace(/^(refs\/heads\/|origin\/)/, ''),
-      commit: process.env.BUILDKITE_COMMIT,
-      targetBranch:
-        process.env.GITHUB_PR_TARGET_BRANCH ||
-        process.env.BUILDKITE_PULL_REQUEST_BASE_BRANCH ||
-        null,
-      mergeBase: process.env.GITHUB_PR_MERGE_BASE || null, // TODO confirm GITHUB_PR_MERGE_BASE or switch to final var
-    });
+    await CiStats.onStart();
   } catch (ex) {
     console.error(ex);
     process.exit(1);