Update CI scripts and config

Author: stevejgordon

.ci/DockerFile

@@ -1,4 +1,4 @@
-ARG DOTNET_VERSION=5.0.103
+ARG DOTNET_VERSION=6.0.101
 FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
 
 ARG USER_ID

.ci/jobs/elastic+elasticsearch-net+pull-request.yml

@@ -11,11 +11,10 @@
         refspec: +refs/pull/*:refs/remotes/origin/pr/*
     triggers:
     - github-pull-request:
-        black-list-target-branches:
-        - '6\.(?:x|\d+?)'
         org-list:
         - elastic
         allow-whitelist-orgs-as-admins: true
         github-hooks: true
         status-context: clients-ci
         cancel-builds-on-update: true
+    publishers: []

.ci/make.sh

@@ -42,7 +42,7 @@ OUTPUT_DIR="$repo/${output_folder}"
 REPO_BINDING="${OUTPUT_DIR}:/sln/${output_folder}"
 mkdir -p "$OUTPUT_DIR"
 
-DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
+DOTNET_VERSION=${DOTNET_VERSION-6.0.101}
 
 echo -e "\033[34;1mINFO:\033[0m PRODUCT ${product}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"

.ci/readme.md

@@ -30,7 +30,7 @@ $ STACK_VERSION=8.0.0-SNAPSHOT ./.ci/run-tests
 |-------------------------|-------------|-------------|
 | `STACK_VERSION` | `N/A`       | The elasticsearch version to target
 | `TEST_SUITE`            | `basic`     | `free` or `platinum` sets which test suite to run and which container to run against. |
-| `DOTNET_VERSION`        | `5.0.103`   | The .NET sdk version used to grab the proper container |
+| `DOTNET_VERSION`        | `6.0.101`   | The .NET sdk version used to grab the proper container |
 
 If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use
 

.ci/run-elasticsearch.ps1

@@ -160,7 +160,6 @@ $environment = @(
   "--env", "node.attr.testattr=test",
   "--env", "path.repo=/tmp",
   "--env", "repositories.url.allowed_urls=http://snapshot.test*",
-  "--env", "action.destructive_requires_name=false"
   "--env", "ingest.geoip.downloader.enabled=false"
 )
 

.ci/run-elasticsearch.sh

@@ -7,13 +7,17 @@
 # Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
-# Version 1.1.0
+# Version 1.4.0
 # - Initial version of the run-elasticsearch.sh script
 # - Deleting the volume should not dependent on the container still running
 # - Fixed `ES_JAVA_OPTS` config
 # - Moved to STACK_VERSION and TEST_VERSION
 # - Refactored into functions and imports
 # - Support NUMBER_OF_NODES
+# - Added 5 retries on docker pull for fixing transient network errors
+# - Added flags to make local CCR configurations work
+# - Added action.destructive_requires_name=false as the default will be true in v8
+# - Added ingest.geoip.downloader.enabled=false as it causes false positives in testing
 
 # Version 1.2.0
 # - Added action.destructive_requires_name=false as the default will be true in v8
@@ -46,8 +50,8 @@ environment=($(cat <<-END
   --env node.attr.testattr=test
   --env path.repo=/tmp
   --env repositories.url.allowed_urls=http://snapshot.test*
-  --env action.destructive_requires_name=false
   --env ingest.geoip.downloader.enabled=false
+  --env cluster.deprecation_indexing.enabled=false
 END
 ))
 if [[ "$TEST_SUITE" == "platinum" ]]; then

.ci/run-repository.ps1

@@ -14,7 +14,7 @@ param(
     $NODE_NAME,
 
     [string]
-    $DOTNET_VERSION = "5.0.103"
+    $DOTNET_VERSION = "6.0.101"
 )
 
 $ESC = [char]27

.ci/run-repository.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 # parameters are available to this script
 
-
 # STACK_VERSION -- version e.g Major.Minor.Patch(-Prelease)
 # TEST_SUITE -- which test suite to run: free or platinum
 # ELASTICSEARCH_URL -- The url at which elasticsearch is reachable, a default is composed based on STACK_VERSION and TEST_SUITE
@@ -10,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
 set -euo pipefail
 
-DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
+DOTNET_VERSION=${DOTNET_VERSION-6.0.101}
 ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
 elasticsearch_container=${elasticsearch_container-}
 

.ci/run-tests.ps1

@@ -8,7 +8,7 @@ param (
     $TEST_SUITE = "free",
 
     [string]
-    $DOTNET_VERSION = "5.0.103"
+    $DOTNET_VERSION = "6.0.101"
 )
 
 $ESC = [char]27

.ci/test-matrix.yml

@@ -8,6 +8,6 @@ TEST_SUITE:
   - platinum
 
 DOTNET_VERSION:
-  - 5.0.103
+    - 6.0.101
 
 exclude: ~