Merge branch 'master' into bug/truncate-hostname-and-policyname

.backportrc.json

@@ -3,6 +3,7 @@
   "targetBranchChoices": [
     { "name": "master", "checked": true },
     { "name": "7.x", "checked": true },
+    "7.10",
     "7.9",
     "7.8",
     "7.7",
@@ -27,7 +28,7 @@
   "targetPRLabels": ["backport"],
   "branchLabelMapping": {
     "^v8.0.0$": "master",
-    "^v7.10.0$": "7.x",
+    "^v7.11.0$": "7.x",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   }
 }

packages/kbn-pm/dist/index.js

@@ -196,6 +196,7 @@ function help() {
         --oss                   Do not include the x-pack when running command.
         --skip-kibana-plugins   Filter all plugins in ./plugins and ../kibana-extra when running command.
         --no-cache              Disable the bootstrap cache
+        --no-validate           Disable the bootstrap yarn.lock validation
         --verbose               Set log level to verbose
         --debug                 Set log level to debug
         --quiet                 Set log level to error
@@ -222,9 +223,10 @@ async function run(argv) {
       i: 'include'
     },
     default: {
-      cache: true
+      cache: true,
+      validate: true
     },
-    boolean: ['prefer-offline', 'frozen-lockfile', 'cache']
+    boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate']
   });
   const args = options._;
 
@@ -8998,7 +9000,11 @@ const BootstrapCommand = {
     }
 
     const yarnLock = await Object(_utils_yarn_lock__WEBPACK_IMPORTED_MODULE_6__["readYarnLock"])(kbn);
-    await Object(_utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__["validateYarnLock"])(kbn, yarnLock);
+
+    if (options.validate) {
+      await Object(_utils_validate_yarn_lock__WEBPACK_IMPORTED_MODULE_7__["validateYarnLock"])(kbn, yarnLock);
+    }
+
     await Object(_utils_link_project_executables__WEBPACK_IMPORTED_MODULE_0__["linkProjectExecutables"])(projects, projectGraph);
     /**
      * At the end of the bootstrapping process we call all `kbn:bootstrap` scripts

packages/kbn-pm/src/cli.ts

@@ -47,6 +47,7 @@ function help() {
         --oss                   Do not include the x-pack when running command.
         --skip-kibana-plugins   Filter all plugins in ./plugins and ../kibana-extra when running command.
         --no-cache              Disable the bootstrap cache
+        --no-validate           Disable the bootstrap yarn.lock validation
         --verbose               Set log level to verbose
         --debug                 Set log level to debug
         --quiet                 Set log level to error
@@ -80,8 +81,9 @@ export async function run(argv: string[]) {
     },
     default: {
       cache: true,
+      validate: true,
     },
-    boolean: ['prefer-offline', 'frozen-lockfile', 'cache'],
+    boolean: ['prefer-offline', 'frozen-lockfile', 'cache', 'validate'],
   });
 
   const args = options._;