Skip to content
Merged
Show file tree
Hide file tree
Changes from 6 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
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*.dylib
bin
obj

.vscode/*
# Test binary, built with `go test -c`
*.test

Expand Down
30 changes: 19 additions & 11 deletions .pipelines/TestSql2017.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
variables:
# AZURE_CLIENT_SECRET and SQLPASSWORD must be defined as secret variables in the pipeline.
# AZURE_TENANT_ID and AZURE_CLIENT_ID are not expected to be secret variables, just regular variables
AZURECLIENTSECRET: $(AZURE_CLIENT_SECRET)
PASSWORD: $(SQLPASSWORD)
pool:
vmImage: 'ubuntu-latest'
Expand All @@ -21,14 +18,23 @@ steps:
SQLCMDUSER: sa
SQLPASSWORD: $(PASSWORD)

# The use of client secrets is disallowed now, so commenting out the Azure tests until we can switch to a federated credential.
# - template: include-runtests-linux.yml
# parameters:
# RunName: 'SQLDB'
# # AZURESERVER must be defined as a variable in the pipeline
# SQLCMDSERVER: $(AZURESERVER)
# AZURECLIENTSECRET: $(AZURECLIENTSECRET)

- task: AzureCLI@2
inputs:
addSpnToEnvironment: true
azureSubscription: $(AZURESUBSCRIPTION_SERVICE_CONNECTION_NAME)
scriptType: pscore
scriptLocation: inlineScript
inlineScript: |
Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_CLIENT_ID;]$env:AZURESUBSCRIPTION_CLIENT_ID"
Write-Host "##vso[task.setvariable variable=AZURESUBSCRIPTION_TENANT_ID;]$env:AZURESUBSCRIPTION_TENANT_ID"
gci env:* | sort-object name

- template: include-runtests-linux.yml
parameters:
RunName: 'SQLDB'
# AZURESERVER must be defined as a variable in the pipeline
SQLCMDSERVER: $(AZURESERVER)

- task: Palmmedia.reportgenerator.reportgenerator-build-release-task.reportgenerator@4
displayName: Merge coverage data
inputs:
Expand All @@ -38,6 +44,8 @@ steps:
sourcedirs: '$(Build.SourcesDirectory)' # Optional directories which contain the corresponding source code (separated by semicolon). The source directories are used if coverage report contains classes without path information.
verbosity: 'Info' # The verbosity level of the log messages. Values: Verbose, Info, Warning, Error, Off
tag: '$(build.buildnumber)_#$(build.buildid)_$(Build.SourceBranchName)' # Optional tag or build version.
continueOnError: true
condition: always()
- task: PublishCodeCoverageResults@1
inputs:
codeCoverageTool: Cobertura
Expand Down
9 changes: 3 additions & 6 deletions .pipelines/include-runtests-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ parameters:
- name: SQLPASSWORD
type: string
default: ''
- name: AZURECLIENTSECRET
type: string
default: ''
- name: SQLCMDSERVER
type: string
default: .
Expand All @@ -28,11 +25,11 @@ steps:
SQLPASSWORD: ${{ parameters.SQLPASSWORD }}
SQLCMDUSER: ${{ parameters.SQLCMDUSER }}
SQLCMDPASSWORD: ${{ parameters.SQLPASSWORD }}
AZURE_TENANT_ID: $(AZURE_TENANT_ID)
AZURE_CLIENT_ID: $(AZURE_CLIENT_ID)
AZURE_CLIENT_SECRET: ${{ parameters.AZURECLIENTSECRET }}
SQLCMDSERVER: ${{ parameters.SQLCMDSERVER }}
SQLCMDDBNAME: ${{ parameters.SQLCMDDBNAME }}
AZURESUBSCRIPTION_CLIENT_ID : $(AZURESUBSCRIPTION_CLIENT_ID)
AZURESUBSCRIPTION_TENANT_ID : $(AZURESUBSCRIPTION_TENANT_ID)
SYSTEM_ACCESSTOKEN: $(System.AccessToken)
continueOnError: true

- task: PublishTestResults@2
Expand Down
Loading
Loading