Skip to content

Commit

Permalink
Exclude low pri .net targets in PR builds (#2277)
Browse files Browse the repository at this point in the history
  • Loading branch information
@azabbasi
David R. Williamson authored and azabbasi committed Jan 18, 2022
1 parent 00d5c36 commit 7ab5b78
Show file tree
Hide file tree
Showing 4 changed files with 228 additions and 14 deletions.
1 change: 1 addition & 0 deletions e2e/test/iothub/service/IoTHubCertificateValidationE2ETest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace Microsoft.Azure.Devices.E2ETests.Iothub.Service
{
[TestClass]
[TestCategory("InvalidServiceCertificate")]
[Ignore("TODO: Enable when invalid cert server is back online.")]
public class IoTHubCertificateValidationE2ETest : E2EMsTestBase
{
[LoggedTestMethod]
Expand Down
1 change: 1 addition & 0 deletions e2e/test/provisioning/ProvisioningCertificateValidationE2ETest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ namespace Microsoft.Azure.Devices.E2ETests.Provisioning
{
[TestClass]
[TestCategory("InvalidServiceCertificate")]
[Ignore("TODO: Enable when invalid cert server is back online.")]
public class ProvisioningCertificateValidationE2ETest : E2EMsTestBase
{
[LoggedTestMethod]
Expand Down
11 changes: 9 additions & 2 deletions provisioning/service/src/Query.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,15 @@ namespace Microsoft.Azure.Devices.Provisioning.Service
/// <remarks>
/// The <see cref="Query"/> iterator is the result of the query factory for
/// <list type="bullet">
/// <item><b>IndividualEnrollment:</b>
/// <see cref="ProvisioningServiceClient.CreateIndividualEnrollmentQuery(QuerySpecification, int)"/>
/// <item>
/// <description>
/// <see cref="ProvisioningServiceClient.CreateIndividualEnrollmentQuery(QuerySpecification, int)">IndividualEnrollment</see>
/// </description>
/// </item>
/// <item>
/// <description>
/// <see cref="ProvisioningServiceClient.CreateEnrollmentGroupQuery(QuerySpecification, int)">EnrollmentGroup</see>
/// </description>
/// </item>
/// <item><b>EnrollmentGroup:</b>
/// <see cref="ProvisioningServiceClient.CreateEnrollmentGroupQuery(QuerySpecification, int)"/>
Expand Down
229 changes: 217 additions & 12 deletions vsts/vsts.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,16 @@ resources:
clean: true

jobs:
### Linux build ###
- job: LINUX
displayName: Linux
### Linux build 1 ###
- job: LINUX1
displayName: Linux pri 1 .NET targets
timeoutInMinutes: 75
strategy:
# Change maxParallel to 1 make builds run in serial rather than in parallel
maxParallel: 100
matrix:
.Net Core 3.1:
FRAMEWORK: netcoreapp3.1
.Net Core 2.1.18:
FRAMEWORK: netcoreapp2.1.18

condition: succeeded()
pool:
Expand Down Expand Up @@ -122,20 +120,120 @@ jobs:

condition: always()

### Windows build ###
- job: WINDOWS
displayName: Windows
### Linux build 2 ###
- job: LINUX2
displayName: Linux pri 2 .NET targets
timeoutInMinutes: 75
strategy:
# Change maxParallel to 1 make builds run in serial rather than in parallel
maxParallel: 100
matrix:
.Net Core 3.1:
FRAMEWORK: netcoreapp3.1
.Net Core 2.1.18:
FRAMEWORK: netcoreapp2.1.18
.Net Framework 4.7.2:
FRAMEWORK: net472

condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
pool:
# If this is changed, don't forget to update supported_platforms.md in the root directory. That document outlines what OS we test on and should stay up to date.
vmImage: ubuntu-20.04
steps:
- task: Docker@1
displayName: "Start TPM Simulator"
inputs:
containerregistrytype: "Container Registry"
command: "Run an image"
imageName: aziotbld/testtpm
containerName: "testtpm-instance"

ports: |
127.0.0.1:2321:2321
127.0.0.1:2322:2322
restartPolicy: unlessStopped

- task: Docker@1
displayName: "Start Test Proxy"
inputs:
containerregistrytype: "Container Registry"
command: "Run an image"
imageName: aziotbld/testproxy
containerName: "testproxy-instance"
ports: "127.0.0.1:8888:8888"
restartPolicy: unlessStopped

- powershell: ./vsts/gatedBuild.ps1
displayName: build
env:
IOTHUB_CONNECTION_STRING: $(IOTHUB-CONNECTION-STRING)
IOTHUB_PFX_X509_THUMBPRINT: $(IOTHUB-PFX-X509-THUMBPRINT)
IOTHUB_X509_PFX_CERTIFICATE: $(IOTHUB-X509-PFX-CERTIFICATE)
DPS_IDSCOPE: $(DPS-IDSCOPE)
DPS_GLOBALDEVICEENDPOINT: $(DPS-GLOBALDEVICEENDPOINT)
DPS_INDIVIDUALX509_PFX_CERTIFICATE: $(DPS-INDIVIDUALX509-PFX-CERTIFICATE)
DPS_GROUPX509_PFX_CERTIFICATE: $(DPS-GROUPX509-PFX-CERTIFICATE)
DPS_X509_PFX_CERTIFICATE_PASSWORD: $(DPS-X509-PFX-CERTIFICATE-PASSWORD)
DPS_GROUPX509_CERTIFICATE_CHAIN: $(DPS-GROUPX509-CERTIFICATE-CHAIN)
DPS_TPM_REGISTRATIONID: $(DPS-TPM-REGISTRATIONID)
DPS_TPM_DEVICEID: $(DPS-TPM-DEVICEID)
PROVISIONING_CONNECTION_STRING: $(PROVISIONING-CONNECTION-STRING)
STORAGE_ACCOUNT_CONNECTION_STRING: $(STORAGE-ACCOUNT-CONNECTION-STRING)
IOTHUB_DEVICE_CONN_STRING_INVALIDCERT: $(IOTHUB-DEVICE-CONN-STRING-INVALIDCERT)
IOTHUB_CONN_STRING_INVALIDCERT: $(IOTHUB-CONN-STRING-INVALIDCERT)
DPS_GLOBALDEVICEENDPOINT_INVALIDCERT: $(DPS-GLOBALDEVICEENDPOINT-INVALIDCERT)
PROVISIONING_CONNECTION_STRING_INVALIDCERT: $(PROVISIONING-CONNECTION-STRING-INVALIDCERT)
FAR_AWAY_IOTHUB_HOSTNAME: $(FAR-AWAY-IOTHUB-HOSTNAME)
CUSTOM_ALLOCATION_POLICY_WEBHOOK: $(CUSTOM-ALLOCATION-POLICY-WEBHOOK)
IOTHUB_PROXY_SERVER_ADDRESS: 127.0.0.1:8888
MSFT_TENANT_ID: $(MSFT-TENANT-ID)
LA_AAD_APP_ID: $(LA-AAD-APP-ID)
LA_AAD_APP_CERT_BASE64: $(LA-AAD-APP-CERT-BASE64)
LA_WORKSPACE_ID: $(LA-WORKSPACE-ID)
IOTHUB_X509_CHAIN_DEVICE_NAME: $(IOTHUB-X509-CHAIN-DEVICE-NAME)
HUB_CHAIN_DEVICE_PFX_CERTIFICATE: $(HUB-CHAIN-DEVICE-PFX-CERTIFICATE)
HUB_CHAIN_ROOT_CA_CERTIFICATE: $(HUB-CHAIN-ROOT-CA-CERTIFICATE)
HUB_CHAIN_INTERMEDIATE1_CERTIFICATE: $(HUB-CHAIN-INTERMEDIATE1-CERTIFICATE)
HUB_CHAIN_INTERMEDIATE2_CERTIFICATE: $(HUB-CHAIN-INTERMEDIATE2-CERTIFICATE)
E2E_IKEY: $(E2E-IKEY)
TARGET_BRANCH: $(System.PullRequest.TargetBranch)
FRAMEWORK: $(FRAMEWORK)
IOTHUB_CLIENT_ID: $(IOTHUB-CLIENT-ID)
IOTHUB_CLIENT_SECRET: $(IOTHUB-CLIENT-SECRET)
IOTHUB_USER_ASSIGNED_MSI_RESOURCE_ID: $(IOTHUB-USER-ASSIGNED-MSI-RESOURCE-ID)

- task: CopyFiles@2
displayName: "Copy files to the artifacts folder"
inputs:
SourceFolder: "$(Build.SourcesDirectory)"
Contents: "**/*.trx"
TargetFolder: "$(Build.ArtifactStagingDirectory)"

condition: always()

- task: PublishBuildArtifacts@1
displayName: "Publish Artifact: testresults_linux_$(FRAMEWORK)"
inputs:
ArtifactName: testresults_linux_$(FRAMEWORK)

condition: always()

- task: PublishTestResults@2
displayName: "Publish Test Results **/*.trx"
inputs:
testRunner: VSTest
testRunTitle: "Linux Tests ($(FRAMEWORK)) (Attempt $(System.JobAttempt))"
testResultsFiles: "**/*.trx"

condition: always()

### Windows build 1 ###
- job: WINDOWS1
displayName: Windows pri 1 .NET targets
timeoutInMinutes: 75
strategy:
# Change maxParallel to 1 make builds run in serial rather than in parallel
maxParallel: 100
matrix:
.Net Core 3.1:
FRAMEWORK: netcoreapp3.1
.Net Framework 4.5.1:
FRAMEWORK: net451

Expand Down Expand Up @@ -232,6 +330,113 @@ jobs:

condition: always()

### Windows build 2 ###
- job: WINDOWS2
displayName: Windows pri 2 .NET targets
timeoutInMinutes: 75
strategy:
# Change maxParallel to 1 make builds run in serial rather than in parallel
maxParallel: 100
matrix:
.Net Core 2.1.18:
FRAMEWORK: netcoreapp2.1.18
.Net Framework 4.7.2:
FRAMEWORK: net472

condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest'))
pool:
# If this is changed, don't forget to update supported_platforms.md in the root directory. That document outlines what OS we test on and should stay up to date.
vmImage: windows-2019
steps:
- script: |
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\Common7\\Tools\\VsDevCmd.bat"
sn -Vr *,31bf3856ad364e35
displayName: "Disable strong name validation"
- script: |
choco install -y squid
displayName: "Install Squid"
- powershell: ./vsts/start_tpm_windows.ps1
displayName: "Start TPM Simulator"

- powershell: ./vsts/gatedBuild.ps1
displayName: build
env:
IOTHUB_CONNECTION_STRING: $(IOTHUB-CONNECTION-STRING)
IOTHUB_PFX_X509_THUMBPRINT: $(IOTHUB-PFX-X509-THUMBPRINT)
IOTHUB_X509_PFX_CERTIFICATE: $(IOTHUB-X509-PFX-CERTIFICATE)
DPS_IDSCOPE: $(DPS-IDSCOPE)
DPS_GLOBALDEVICEENDPOINT: $(DPS-GLOBALDEVICEENDPOINT)
DPS_INDIVIDUALX509_PFX_CERTIFICATE: $(DPS-INDIVIDUALX509-PFX-CERTIFICATE)
DPS_GROUPX509_PFX_CERTIFICATE: $(DPS-GROUPX509-PFX-CERTIFICATE)
DPS_X509_PFX_CERTIFICATE_PASSWORD: $(DPS-X509-PFX-CERTIFICATE-PASSWORD)
DPS_GROUPX509_CERTIFICATE_CHAIN: $(DPS-GROUPX509-CERTIFICATE-CHAIN)
DPS_TPM_REGISTRATIONID: $(DPS-TPM-REGISTRATIONID)
DPS_TPM_DEVICEID: $(DPS-TPM-DEVICEID)
PROVISIONING_CONNECTION_STRING: $(PROVISIONING-CONNECTION-STRING)
STORAGE_ACCOUNT_CONNECTION_STRING: $(STORAGE-ACCOUNT-CONNECTION-STRING)
IOTHUB_DEVICE_CONN_STRING_INVALIDCERT: $(IOTHUB-DEVICE-CONN-STRING-INVALIDCERT)
IOTHUB_CONN_STRING_INVALIDCERT: $(IOTHUB-CONN-STRING-INVALIDCERT)
DPS_GLOBALDEVICEENDPOINT_INVALIDCERT: $(DPS-GLOBALDEVICEENDPOINT-INVALIDCERT)
PROVISIONING_CONNECTION_STRING_INVALIDCERT: $(PROVISIONING-CONNECTION-STRING-INVALIDCERT)
FAR_AWAY_IOTHUB_HOSTNAME: $(FAR-AWAY-IOTHUB-HOSTNAME)
CUSTOM_ALLOCATION_POLICY_WEBHOOK: $(CUSTOM-ALLOCATION-POLICY-WEBHOOK)
IOTHUB_PROXY_SERVER_ADDRESS: 127.0.0.1:3128
MSFT_TENANT_ID: $(MSFT-TENANT-ID)
LA_AAD_APP_ID: $(LA-AAD-APP-ID)
LA_AAD_APP_CERT_BASE64: $(LA-AAD-APP-CERT-BASE64)
LA_WORKSPACE_ID: $(LA-WORKSPACE-ID)
IOTHUB_X509_CHAIN_DEVICE_NAME: $(IOTHUB-X509-CHAIN-DEVICE-NAME)
HUB_CHAIN_DEVICE_PFX_CERTIFICATE: $(HUB-CHAIN-DEVICE-PFX-CERTIFICATE)
HUB_CHAIN_ROOT_CA_CERTIFICATE: $(HUB-CHAIN-ROOT-CA-CERTIFICATE)
HUB_CHAIN_INTERMEDIATE1_CERTIFICATE: $(HUB-CHAIN-INTERMEDIATE1-CERTIFICATE)
HUB_CHAIN_INTERMEDIATE2_CERTIFICATE: $(HUB-CHAIN-INTERMEDIATE2-CERTIFICATE)
E2E_IKEY: $(E2E-IKEY)
TARGET_BRANCH: $(System.PullRequest.TargetBranch)
FRAMEWORK: $(FRAMEWORK)
IOTHUB_CLIENT_ID: $(IOTHUB-CLIENT-ID)
IOTHUB_CLIENT_SECRET: $(IOTHUB-CLIENT-SECRET)
IOTHUB_USER_ASSIGNED_MSI_RESOURCE_ID: $(IOTHUB-USER-ASSIGNED-MSI-RESOURCE-ID)

- task: CopyFiles@2
displayName: "Copy TRX files to the artifacts folder"
inputs:
SourceFolder: "$(Build.SourcesDirectory)"
Contents: "**/*.trx"
TargetFolder: "$(Build.ArtifactStagingDirectory)"

condition: always()

- task: CopyFiles@2
displayName: "Copy ETL files to the artifacts folder"
inputs:
SourceFolder: "$(Build.SourcesDirectory)"
Contents: "**/*.etl"
TargetFolder: "$(Build.ArtifactStagingDirectory)"

condition: always()

- task: PublishBuildArtifacts@1
displayName: "Publish Artifact: testresults"
inputs:
ArtifactName: testresults_windows_$(FRAMEWORK)

condition: always()

- task: PublishTestResults@2
displayName: "Publish Test Results **/*.trx"
inputs:
testRunner: VSTest
testResultsFiles: "**/*.trx"
testRunTitle: "Windows Tests ($(FRAMEWORK)) (Attempt $(System.JobAttempt))"
platform: Windows
configuration: "Debug UT + Release E2E ($(FRAMEWORK))"

condition: always()

### WINDOWS Analyzers ###
- job: Analyzers
displayName: Analyzers
Expand Down

0 comments on commit 7ab5b78

Please sign in to comment.