Skip to content

Commit 0329ebb

Browse files
authored
Update Azure Pipelines VMs to latest (#5355)
* Update Azure Pipelines VMs to the latest versions * Disable code coverage for canary * Log extra info, shorten the timeout
1 parent c3aeb4d commit 0329ebb

File tree

12 files changed

+49
-52
lines changed

12 files changed

+49
-52
lines changed

.ci/DockerFile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG DOTNET_VERSION=5.0.102
2-
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-1 AS elasticsearch-net-build
1+
ARG DOTNET_VERSION=5.0.103
2+
FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
33

44
WORKDIR /sln
55

.ci/make.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ output_folder=".ci/output"
1919
OUTPUT_DIR="$repo/${output_folder}"
2020
mkdir -p "$OUTPUT_DIR"
2121

22-
DOTNET_VERSION=${DOTNET_VERSION-5.0.102}
22+
DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
2323

2424
echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
2525
echo -e "\033[34;1mINFO:\033[0m OUTPUT_DIR ${OUTPUT_DIR}\033[0m"

.ci/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ $ STACK_VERSION=7.x-SNAPSHOT ELASTICSEARCH_VERSION=7.x-SNAPSHOT ./.ci/run-tests
3030
|-------------------------|-------------|-------------|
3131
| `STACK_VERSION` | `N/A` | The elasticsearch version to target
3232
| `TEST_SUITE` | `basic` | `free` or `platinum` sets which test suite to run and which container to run against. |
33-
| `DOTNET_VERSION` | `5.0.102` | The .NET sdk version used to grab the proper container |
33+
| `DOTNET_VERSION` | `5.0.103` | The .NET sdk version used to grab the proper container |
3434

3535

3636
If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use

.ci/run-repository.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ param(
1414
$NODE_NAME,
1515

1616
[string]
17-
$DOTNET_VERSION = "5.0.102"
17+
$DOTNET_VERSION = "5.0.103"
1818
)
1919

2020
$ESC = [char]27

.ci/run-repository.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
99
source $script_path/functions/imports.sh
1010
set -euo pipefail
1111

12-
DOTNET_VERSION=${DOTNET_VERSION-5.0.102}
12+
DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
1313
ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
1414
elasticsearch_container=${elasticsearch_container-}
1515

.ci/run-tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ param (
88
$TEST_SUITE = "free",
99

1010
[string]
11-
$DOTNET_VERSION = "5.0.102"
11+
$DOTNET_VERSION = "5.0.103"
1212
)
1313

1414
$ESC = [char]27

.ci/test-matrix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ TEST_SUITE:
88
- platinum
99

1010
DOTNET_VERSION:
11-
- 5.0.102
11+
- 5.0.103
1212

1313
exclude: ~

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ environment:
66
DOTNET_CLI_TELEMETRY_OPTOUT: true
77
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
88
install:
9-
- cmd: choco install dotnet-5.0-sdk --version 5.0.102
9+
- cmd: choco install dotnet-5.0-sdk --version 5.0.103
1010
build_script:
1111
- cmd: build.bat canary
1212

azure-pipelines.yml

Lines changed: 36 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,24 @@ pr:
1414
jobs:
1515
- job: StaleDocs
1616
pool:
17-
vmImage: 'ubuntu-16.04'
17+
vmImage: 'ubuntu-20.04'
1818
steps:
1919
- task: UseDotNet@2
2020
inputs:
21-
version: '5.0.102'
21+
version: '5.0.103'
2222
- script: ./build.sh documentation
2323
displayName: 'Generate Documentation'
2424
- script: |
2525
if [ -n "$(git status --porcelain)" ]; then echo Error: changes found after running documentation; git diff; git status; exit 1; fi
2626
displayName: 'Ensure no uncommitted docs'
27+
2728
- job: LinuxUnitTests
2829
pool:
29-
vmImage: 'ubuntu-16.04'
30+
vmImage: 'ubuntu-20.04'
3031
steps:
3132
- task: UseDotNet@2
3233
inputs:
33-
version: '5.0.102'
34+
version: '5.0.103'
3435
- script: ./build.sh test-one
3536
displayName: 'build and unit test'
3637
- task: PublishTestResults@2
@@ -58,24 +59,21 @@ jobs:
5859

5960
- job: WindowsCanaryTests
6061
pool:
61-
vmImage: 'vs2017-win2016'
62-
steps:
63-
- task: UseDotNet@2
64-
inputs:
65-
version: '5.0.102'
66-
- script: build.bat canary
67-
displayName: 'build and unit test'
68-
- task: PublishTestResults@2
69-
condition: succeededOrFailed()
70-
inputs:
71-
testRunner: VSTest
72-
testResultsFiles: 'tests/**/*.trx'
73-
testRunTitle: Windows Unit Tests
62+
vmImage: 'windows-2019'
63+
steps:
64+
- script: build.bat canary
65+
displayName: 'build and unit test'
66+
- task: PublishTestResults@2
67+
condition: succeededOrFailed()
68+
inputs:
69+
testRunner: VSTest
70+
testResultsFiles: 'tests/**/*.trx'
71+
testRunTitle: Windows Unit Tests
7472

7573
- job: WindowsIntegrationTests
7674
dependsOn: WindowsCanaryTests
7775
pool:
78-
vmImage: 'vs2017-win2016'
76+
vmImage: 'windows-2019'
7977
strategy:
8078
maxParallel: 5
8179
matrix:
@@ -108,22 +106,19 @@ jobs:
108106
latest7:
109107
esVersion: 'latest-7'
110108
steps:
111-
- task: UseDotNet@2
112-
inputs:
113-
version: '5.0.102'
114-
- script: 'build.bat integrate-one $(esVersion) "readonly,writable,bool,xpack"'
115-
displayName: '$(esVersion) windows integration tests'
116-
- task: PublishTestResults@2
117-
condition: succeededOrFailed()
118-
inputs:
119-
testRunner: VSTest
120-
testResultsFiles: 'tests/Tests/**/*.trx'
121-
testRunTitle: '$(esVersion) Windows Integration Tests'
109+
- script: 'build.bat integrate-one $(esVersion) "readonly,writable,bool,xpack"'
110+
displayName: '$(esVersion) windows integration tests'
111+
- task: PublishTestResults@2
112+
condition: succeededOrFailed()
113+
inputs:
114+
testRunner: VSTest
115+
testResultsFiles: 'tests/Tests/**/*.trx'
116+
testRunTitle: '$(esVersion) Windows Integration Tests'
122117

123118
- job: LinuxIntegrationTests
124119
dependsOn: LinuxUnitTests
125120
pool:
126-
vmImage: 'ubuntu-16.04'
121+
vmImage: 'ubuntu-20.04'
127122
strategy:
128123
maxParallel: 5
129124
matrix:
@@ -156,14 +151,14 @@ jobs:
156151
latest7:
157152
esVersion: 'latest-7'
158153
steps:
159-
- task: UseDotNet@2
160-
inputs:
161-
version: '5.0.102'
162-
- script: './build.sh integrate-one $(esVersion) "readonly,writable"'
163-
displayName: '$(esVersion) linux integration tests'
164-
- task: PublishTestResults@2
165-
condition: succeededOrFailed()
166-
inputs:
167-
testRunner: VSTest
168-
testResultsFiles: 'tests/Tests/**/*.trx'
169-
testRunTitle: '$(esVersion) Linux Integration Tests'
154+
- task: UseDotNet@2
155+
inputs:
156+
version: '5.0.103'
157+
- script: './build.sh integrate-one $(esVersion) "readonly,writable"'
158+
displayName: '$(esVersion) linux integration tests'
159+
- task: PublishTestResults@2
160+
condition: succeededOrFailed()
161+
inputs:
162+
testRunner: VSTest
163+
testResultsFiles: 'tests/Tests/**/*.trx'
164+
testRunTitle: '$(esVersion) Linux Integration Tests'

build/scripts/Commandline.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Execution hints can be provided anywhere on the command line
207207
parsed with CommandArguments = Test {
208208
TestFilter = None
209209
TrxExport = buildingOnAzurePipeline
210-
CodeCoverage = buildingOnAzurePipeline
210+
CodeCoverage = false
211211
}
212212
}
213213

0 commit comments

Comments
 (0)