Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions eng/pipelines/templates/jobs/live.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -244,18 +244,14 @@ jobs:
# Will run samples described on a file name [service]-samples.txt within the build directory.
# For example keyvault-samples.txt.
# The file is written by CMake during configuration when building samples.
- task: AzurePowerShell@5
displayName: "Run Samples for : ${{ parameters.ServiceDirectory }}"
- task: AzureCLI@2
displayName: "Run Samples with AzureCli for : ${{ parameters.ServiceDirectory }}"
condition: and(succeeded(), eq(variables['RunSamples'], '1'))
inputs:
azureSubscription: ${{ parameters.CloudConfig.ServiceConnection }}
azurePowerShellVersion: LatestVersion
ScriptType: InlineScript
Inline: |
$account = (Get-AzContext).Account
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants

scriptType: 'pscore'
scriptLocation: 'inlineScript'
inlineScript: |
if (Test-Path -Path "${{ parameters.ServiceDirectory }}-samples.txt") {
$samples = Get-Content "${{ parameters.ServiceDirectory }}-samples.txt"
foreach ($sample in $samples) {
Expand All @@ -269,8 +265,8 @@ jobs:
}
}
workingDirectory: build
useGlobalConfig: true
env:
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
${{ insert }}: ${{ parameters.EnvVars }}

- ${{ else }}:
Expand Down
4 changes: 0 additions & 4 deletions eng/pipelines/templates/stages/platform-matrix-live.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
"CMAKE_GENERATOR_PLATFORM": "x64",
"CmakeArgs": " -DBUILD_TRANSPORT_CURL=ON -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DMSVC_USE_STATIC_CRT=ON -DDISABLE_PROXY_TESTS=ON ",
"BuildArgs": "-v --parallel 8 --config Release",
"RunSamples": 1,
"WindowsCtestConfig": "-C Release"
}
}
Expand Down Expand Up @@ -142,7 +141,6 @@
"CmakeArgs": " -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DDISABLE_AZURE_CORE_OPENTELEMETRY=ON ",
"BuildArgs": "-v --parallel 8 --config Release",
"AZURE_CORE_ENABLE_JSON_TESTS": 1,
"RunSamples": 1,
"WindowsCtestConfig": "-C Release"
},
"x64_with_unit_test_winHttp": {
Expand All @@ -159,7 +157,6 @@
"CMAKE_GENERATOR_PLATFORM": "x64",
"CmakeArgs": " -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DMSVC_USE_STATIC_CRT=ON ",
"BuildArgs": "-v --parallel 8 --config Release",
"RunSamples": 1,
"WindowsCtestConfig": "-C Release"
},
"x64_with_unit_samples_libcurl": {
Expand All @@ -168,7 +165,6 @@
"CMAKE_GENERATOR_PLATFORM": "x64",
"CmakeArgs": " -DBUILD_TRANSPORT_CURL=ON -DBUILD_TESTING=ON -DRUN_LONG_UNIT_TESTS=ON -DBUILD_PERFORMANCE_TESTS=ON -DBUILD_SAMPLES=ON -DMSVC_USE_STATIC_CRT=ON ",
"BuildArgs": "-v --parallel 8 --config Release",
"RunSamples": 1,
"WindowsCtestConfig": "-C Release"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable (
certificate_basic_operations.cpp
)

create_per_service_target_build_for_sample(keyvault certificate-basic-operations DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault certificate-basic-operations)

target_link_libraries(certificate-basic-operations PRIVATE azure-security-keyvault-certificates azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
certificate-get-certificates
certificate_get_certificates.cpp
)
create_per_service_target_build_for_sample(keyvault certificate-get-certificates DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault certificate-get-certificates)

target_link_libraries(certificate-get-certificates PRIVATE azure-security-keyvault-certificates azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
certificate-import-certificate
certificate_import_certificate.cpp
)
create_per_service_target_build_for_sample(keyvault certificate-import-certificate DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault certificate-import-certificate)

target_link_libraries(certificate-import-certificate PRIVATE azure-security-keyvault-certificates azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable (
sample1_hello_world.cpp
)

create_per_service_target_build_for_sample(keyvault sample1-hello-world DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample1-hello-world)

target_link_libraries(sample1-hello-world PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
sample2-backup-and-restore
sample2_backup_and_restore.cpp
)
create_per_service_target_build_for_sample(keyvault sample2-backup-and-restore DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample2-backup-and-restore)

target_link_libraries(sample2-backup-and-restore PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
sample3-get-keys
sample3_get_keys.cpp
)
create_per_service_target_build_for_sample(keyvault sample3-get-keys DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample3-get-keys)

target_link_libraries(sample3-get-keys PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
sample4-encrypt-decrypt
sample4_encrypt_decrypt.cpp
)
create_per_service_target_build_for_sample(keyvault sample4-encrypt-decrypt DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample4-encrypt-decrypt)

target_link_libraries(sample4-encrypt-decrypt PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
sample5-sign-verify
sample5_sign_verify.cpp
)
create_per_service_target_build_for_sample(keyvault sample5-sign-verify DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample5-sign-verify)

target_link_libraries(sample5-sign-verify PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
sample6-wrap-unwrap
sample6_wrap_unwrap.cpp
)
create_per_service_target_build_for_sample(keyvault sample6-wrap-unwrap DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample6-wrap-unwrap)

target_link_libraries(sample6-wrap-unwrap PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
sample7-key-rotation
sample7_key_rotation.cpp
)
create_per_service_target_build_for_sample(keyvault sample7-key-rotation DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample7-key-rotation)

target_link_libraries(sample7-key-rotation PRIVATE azure-security-keyvault-keys azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ add_executable (
sample1-basic-operations
sample1_basic_operations.cpp
)
create_per_service_target_build_for_sample(keyvault sample1-basic-operations DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample1-basic-operations)

target_link_libraries(sample1-basic-operations PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable (
sample2_backup_restore.cpp
)

create_per_service_target_build_for_sample(keyvault sample2-backup-restore DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample2-backup-restore)

target_link_libraries(sample2-backup-restore PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable (
sample3_delete_recover.cpp
)

create_per_service_target_build_for_sample(keyvault sample3-delete-recover DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample3-delete-recover)

target_link_libraries(sample3-delete-recover PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ add_executable (
sample4_get_secrets_deleted.cpp
)

create_per_service_target_build_for_sample(keyvault sample4-get-secrets-deleted DISABLE_RUN)
create_per_service_target_build_for_sample(keyvault sample4-get-secrets-deleted)

target_link_libraries(sample4-get-secrets-deleted PRIVATE azure-security-keyvault-secrets azure-identity get-env-helper)