Skip to content

[do not merge] update OSName to OSVmName #11393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
scbedd wants to merge 2 commits into from
Closed

[do not merge] update OSName to OSVmName #11393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
498c495
update OSName to OSVmName
scbedd May 12, 2020
d83208e
touch a appconfig file to trigger a build
scbedd May 12, 2020
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
18 changes: 9 additions & 9 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,49 +9,49 @@ parameters:
BuildDocs: true
TestMatrix:
Linux_Python27:
OSName: 'Linux'
OSVmName: 'Linux'

@weshaggard weshaggard May 12, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Once we resolve Azure/azure-sdk-tools#610 (comment) we should be able to simply remove the OSName from all the matrix entries.

OSVmImage: 'ubuntu-18.04'
PythonVersion: '2.7'
CoverageArg: ''
RunForPR: true
Linux_Python35:
OSName: 'Linux'
OSVmName: 'Linux'

@chidozieononiwu chidozieononiwu May 13, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are just removing this completely for all the matrix entries.

@scbedd scbedd May 13, 2020

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We use it when publishing the test run title, so I'm going to keep the parameter around (just renamed).

I should just be able to remove the parameter being passed to the common yml yes?

@chidozieononiwu chidozieononiwu May 13, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will be set within the script. So I think you don't need the variable at all, so long as the verify-agent-os script runs a s the first step. it is set here

OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.5'
CoverageArg: ''
RunForPR: false
Linux_Python36:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.6'
CoverageArg: ''
RunForPR: false
Linux_Python37:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.7'
CoverageArg: ''
RunForPR: false
Linux_Python38:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.8'
CoverageArg: ''
RunForPR: true
Windows_Python35:
OSName: 'Windows'
OSVmName: 'Windows'
OSVmImage: 'windows-2019'
PythonVersion: '3.5'
CoverageArg: ''
RunForPR: true
MacOS_Python27:
OSName: 'MacOS'
OSVmName: 'MacOS'
OSVmImage: 'macOS-10.15'
PythonVersion: '2.7'
CoverageArg: ''
RunForPR: false
Linux_pypy3:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: 'pypy3'
CoverageArg: '--disablecov'
Expand Down Expand Up @@ -128,7 +128,7 @@ jobs:
ServiceDirectory: ${{ parameters.ServiceDirectory }}
TestMarkArgument: ${{ parameters.TestMarkArgument }}
AdditionalTestArgs: '--wheel_dir="$(Build.ArtifactStagingDirectory)"'
OSName: $(OSName)
OSVmName: $(OSVmName)
CoverageArg: $(CoverageArg)
PythonVersion: $(PythonVersion)
BuildTargetingString: ${{ parameters.BuildTargetingString }}
Expand Down
12 changes: 6 additions & 6 deletions eng/pipelines/templates/jobs/archetype-sdk-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,23 @@ parameters:
TestTimeoutInMinutes: 120
Matrix:
Linux_Python35:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.5'
MacOs_Python37:
OSName: 'MacOS'
OSVmName: 'MacOS'
OSVmImage: 'macOS-10.15'
PythonVersion: '3.7'
Windows_Python27:
OSName: 'Windows'
OSVmName: 'Windows'
OSVmImage: 'windows-2019'
PythonVersion: '2.7'
Linux_PyPy3:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: 'pypy3'
Linux_Python38:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.8'

Expand Down Expand Up @@ -78,7 +78,7 @@ jobs:
BeforeTestSteps: ${{ parameters.BeforeTestSteps }}
AfterTestSteps: ${{ parameters.AfterTestSteps }}
PythonVersion: $(PythonVersion)
OSName: $(OSName)
OSVmName: $(OSVmName)

@chidozieononiwu chidozieononiwu May 13, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should just remove this parameter as its no longer required.

ToxTestEnv: "whl"
AdditionalTestArgs: ${{ parameters.AdditionalTestArgs }}
TestMarkArgument: ${{ parameters.TestMarkArgument }}
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/jobs/tests-nightly-python.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ jobs:
condition: always()
inputs:
testResultsFiles: '**/junit/test-results.xml'
testRunTitle: '$(OSName) Python $(PythonVersion)'
testRunTitle: '$(OSVmName) Python $(PythonVersion)'

@chidozieononiwu chidozieononiwu May 13, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should leave this as $(OSName) since it will be set by the verify-agent-os.yml script here

failTaskOnFailedTests: true
6 changes: 3 additions & 3 deletions eng/pipelines/templates/stages/cosmos-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ stages:
matrix:
Windows_Python35:
OSVmImage: 'windows-2019'
OSName: Windows
OSVmName: Windows
PythonVersion: '3.5'
Windows_Python27:
OSVmImage: 'windows-2019'
OSName: Windows
OSVmName: Windows
PythonVersion: '2.7'
pool:
vmImage: $(OSVmImage)
Expand All @@ -43,7 +43,7 @@ stages:
ACCOUNT_HOST: https://localhost:8081/
ServiceDirectory: ${{ parameters.ServiceDirectory }}
PythonVersion: $(PythonVersion)
OSName: $(OSName)
OSVmName: $(OSVmName)
ToxTestEnv: 'whl,sdist'
BuildDocs: ${{parameters.BuildDocs}}
InjectedPackages: ${{parameters.InjectedPackages}}
Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/steps/build-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ parameters:
EnvVars: {}
ServiceDirectory: ''
PythonVersion: ''
OSName: ''
OSVmName: ''
BeforeTestSteps: []
AfterTestSteps: []
CoverageArg: ''
Expand All @@ -25,7 +25,7 @@ steps:

- template: eng/pipelines/templates/scripts/verify-agent-os.yml@azure-sdk-tools
parameters:
OSName: ${{ parameters.OSName }}
OSName: ${{ parameters.OSVmName }}

@chidozieononiwu chidozieononiwu May 13, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are now calling this without parameters, assuming that the $(OSVMImage) is already set. We are also calling it from the eng/common directory. see here , here and here


- script: |
python -m pip install pip == 20.1
Expand Down Expand Up @@ -56,7 +56,7 @@ steps:
condition: always()
inputs:
testResultsFiles: '**/*test*.xml'
testRunTitle: '${{ parameters.OSName }} Python ${{ parameters.PythonVersion }}'
testRunTitle: '${{ parameters.OSVmName }} Python ${{ parameters.PythonVersion }}'
failTaskOnFailedTests: true

- template: publish-coverage.yml
Expand Down
1 change: 0 additions & 1 deletion sdk/appconfiguration/azure-appconfiguration/dev_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@
aiohttp>=3.0; python_version >= '3.5'
aiodns>=2.0; python_version >= '3.5'
msrest>=0.6.10

8 changes: 4 additions & 4 deletions sdk/eventhub/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ jobs:
ServiceDirectory: eventhub
Matrix:
Linux_Python35:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.5'
Linux_Python38:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.8'
Windows_Python27:
OSName: 'Windows'
OSVmName: 'Windows'
OSVmImage: 'windows-2019'
PythonVersion: '2.7'
MacOs_Python37:
OSName: 'MacOS'
OSVmName: 'MacOS'
OSVmImage: 'macOS-10.15'
PythonVersion: '3.7'
EnvVars:
Expand Down
8 changes: 4 additions & 4 deletions sdk/servicebus/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,18 @@ jobs:
AZURE_TEST_RUN_LIVE: 'true'
Matrix:
Linux_Python35:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.5'
MacOs_Python37:
OSName: 'MacOS'
OSVmName: 'MacOS'
OSVmImage: 'macOS-10.15'
PythonVersion: '3.7'
Windows_Python27:
OSName: 'Windows'
OSVmName: 'Windows'
OSVmImage: 'windows-2019'
PythonVersion: '2.7'
Linux_Python38:
OSName: 'Linux'
OSVmName: 'Linux'
OSVmImage: 'ubuntu-18.04'
PythonVersion: '3.8'