Merge branch 'master' into 2021-05-19-check-metadata-index-before-loading

Author: DaveCTurner

.ci/bwcVersions

@@ -35,5 +35,6 @@ BWC_VERSION:
   - "7.12.1"
   - "7.13.0"
   - "7.13.1"
+  - "7.13.2"
   - "7.14.0"
   - "8.0.0"

.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-arm.yml

@@ -3,6 +3,7 @@
     name: elastic+elasticsearch+%BRANCH%+multijob+platform-support-arm
     display-name: "elastic / elasticsearch # %BRANCH% - arm compatibility"
     description: "Elasticsearch %BRANCH% ARM (aarch64) compatibility testing.\n"
+    child-workspace: "/dev/shm/elastic+elasticsearch+%BRANCH%+multijob+platform-support-arm"
     project-type: matrix
     node: master
     scm:

.ci/jobs.t/elastic+elasticsearch+pull-request+docs-check.yml

@@ -7,7 +7,7 @@
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
-          branches: 
+          branches:
             - "${ghprbActualCommit}"
     triggers:
       - github-pull-request:
@@ -20,6 +20,7 @@
           cancel-builds-on-update: true
           white-list-target-branches:
             - %BRANCH%
+            - ^feat(ure)?/.*
           included-regions:
             - ^docs/.*
           black-list-labels:

.ci/jobs.t/elastic+elasticsearch+pull-request+eql-correctness.yml

@@ -7,7 +7,7 @@
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
-          branches: 
+          branches:
             - "${ghprbActualCommit}"
     triggers:
       - github-pull-request:
@@ -20,6 +20,7 @@
           cancel-builds-on-update: true
           white-list-target-branches:
             - %BRANCH%
+            - ^feat(ure)?/.*
           excluded-regions:
             - ^docs/.*
           black-list-labels:

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix-sample.yml

@@ -8,7 +8,7 @@
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
-          branches: 
+          branches:
             - "${ghprbActualCommit}"
     triggers:
       - github-pull-request:
@@ -21,6 +21,7 @@
           cancel-builds-on-update:
           white-list-target-branches:
             - %BRANCH%
+            - ^feat(ure)?/.*
           excluded-regions:
             - ^docs/.*
           black-list-labels:

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix.yml

@@ -8,7 +8,7 @@
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
-          branches: 
+          branches:
             - "${ghprbActualCommit}"
     triggers:
       - github-pull-request:
@@ -21,6 +21,7 @@
           cancel-builds-on-update: true
           white-list-target-branches:
             - %BRANCH%
+            - ^feat(ure)?/.*
           excluded-regions:
             - ^docs/.*
           white-list-labels:

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml

@@ -10,7 +10,7 @@
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
-          branches: 
+          branches:
             - "${ghprbActualCommit}"
     triggers:
       - github-pull-request:
@@ -23,6 +23,7 @@
           cancel-builds-on-update: true
           white-list-target-branches:
             - %BRANCH%
+            - ^feat(ure)?/.*
           excluded-regions:
             - ^docs/.*
           black-list-labels:

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows.yml

@@ -10,7 +10,7 @@
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
-          branches: 
+          branches:
             - "${ghprbActualCommit}"
     triggers:
       - github-pull-request:
@@ -23,6 +23,7 @@
           cancel-builds-on-update: true
           white-list-target-branches:
             - %BRANCH%
+            - ^feat(ure)?/.*
           excluded-regions:
             - ^docs/.*
           white-list-labels:

.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-fips.yml

@@ -7,7 +7,7 @@
     scm:
       - git:
           refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
-          branches: 
+          branches:
             - "${ghprbActualCommit}"
     triggers:
       - github-pull-request:
@@ -20,6 +20,7 @@
           cancel-builds-on-update: true
           white-list-target-branches:
             - %BRANCH%
+            - ^feat(ure)?/.*
           excluded-regions:
             - ^docs/.*
           white-list-labels:
@@ -34,4 +35,4 @@
             RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
       - shell: |
           #!/usr/local/bin/runbld --redirect-stderr
-          $WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart1
+          $WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.fips.enabled=true checkPart1

.ci/jobs.t/elastic+elasticsearch+pull-request+part-1-windows.yml

@@ -0,0 +1,44 @@
+---
+- job:
+    name: "elastic+elasticsearch+%BRANCH%+pull-request/elastic+elasticsearch+%BRANCH%+pull-request+part-1-windows"
+    display-name: "elastic / elasticsearch # %BRANCH% - pull request part-1 windows"
+    description: "Testing of Elasticsearch pull requests - part-1 windows"
+    node: "windows-immutable"
+    workspace: "C:\\Users\\jenkins\\workspace\\pr-part-1\\${BUILD_NUMBER}"
+    scm:
+      - git:
+          refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
+          branches:
+            - "${ghprbActualCommit}"
+    triggers:
+      - github-pull-request:
+          org-list:
+            - elastic
+          allow-whitelist-orgs-as-admins: true
+          trigger-phrase: '.*run\W+elasticsearch-ci/part-1-windows.*'
+          github-hooks: true
+          status-context: elasticsearch-ci/part-1-windows
+          cancel-builds-on-update: true
+          white-list-target-branches:
+            - %BRANCH%
+            - ^feat(ure)?/.*
+          excluded-regions:
+            - ^docs/.*
+          white-list-labels:
+            - 'test-windows'
+          black-list-labels:
+            - '>test-mute'
+    builders:
+      - inject:
+          properties-file: '.ci/java-versions.properties'
+          properties-content: |
+            JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
+            RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
+            GRADLE_TASK=checkPart1
+      - batch: |
+          del /f /s /q %USERPROFILE%\.gradle\init.d\*.*
+          mkdir %USERPROFILE%\.gradle\init.d
+          copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
+          (
+            echo call %GRADLEW_BAT% --max-workers=4 -Dbwc.checkout.align=true %GRADLE_TASK% ^|^| exit /b 1
+          ) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -