Skip to content

Commit 293ba24

Browse files
author
Sam Eagen
committed
Merge with master. Use error instead of raw promise rejection
2 parents 27f250a + 8dcdf43 commit 293ba24

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+5350
-1725
lines changed

integ-test-promote-template.yml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,13 @@ jobs:
7272
microsoft_hosted_windows:
7373
poolName: Azure Pipelines
7474
vmImage: windows-latest
75-
self_hosted_windows:
76-
poolName: vmssagentpool
77-
vmImage: # blank for self-hosted
7875
pool:
7976
name: $(poolName)
8077
vmImage: $(vmImage)
8178
steps:
8279
- checkout: none
8380
- task: MathWorks.matlab-azure-devops-extension-dev.InstallMATLAB.InstallMATLAB@${{ version }}
8481
displayName: Install MATLAB on Microsoft-hosted agents
85-
condition: not(startsWith(variables['Agent.Name'], 'vmss'))
8682
- task: MathWorks.matlab-azure-devops-extension-dev.RunMATLABCommand.RunMATLABCommand@${{ version }}
8783
displayName: Run MATLAB statement
8884
inputs:
@@ -146,9 +142,6 @@ jobs:
146142
microsoft_hosted_linux:
147143
poolName: Azure Pipelines
148144
vmImage: ubuntu-22.04
149-
self_hosted_windows:
150-
poolName: vmssagentpool
151-
vmImage: # blank for self-hosted
152145
pool:
153146
name: $(poolName)
154147
vmImage: $(vmImage)
@@ -158,12 +151,12 @@ jobs:
158151
- checkout: none
159152
- task: MathWorks.matlab-azure-devops-extension-dev.InstallMATLAB.InstallMATLAB@${{ version }}
160153
displayName: Install MATLAB on Microsoft-hosted agents
161-
condition: and(eq(${{ version }}, '0'), not(startsWith(variables['Agent.Name'], 'vmss')))
154+
condition: eq(${{ version }}, '0')
162155
- task: MathWorks.matlab-azure-devops-extension-dev.InstallMATLAB.InstallMATLAB@${{ version }}
163156
inputs:
164157
products: Simulink Simulink_Test Simulink_Coverage Parallel_Computing_Toolbox
165158
displayName: Install MATLAB on Microsoft-hosted agents
166-
condition: and(eq(${{ version }}, '1'), not(startsWith(variables['Agent.Name'], 'vmss')))
159+
condition: eq(${{ version }}, '1')
167160
- bash: |
168161
echo 'myvar = 123' > startup.m
169162
mkdir src
@@ -239,18 +232,19 @@ jobs:
239232
grep -q "runner.addPlugin(FailOnWarningsPlugin())" console.log
240233
rm console.log
241234
displayName: Verify tests ran with strict checks
242-
- task: MathWorks.matlab-azure-devops-extension-dev.RunMATLABTests.RunMATLABTests@${{ version }}
243-
displayName: Run MATLAB tests in parallel
244-
inputs:
245-
useParallel: true
246-
sourceFolder: src
247-
condition: not(eq(${{ version }}, '0'))
248-
- bash: |
249-
set -e
250-
grep -q "Starting parallel pool (parpool)" console.log
251-
rm console.log
252-
displayName: Verify tests ran in parallel
253-
condition: not(eq(${{ version }}, '0'))
235+
# Disable parallel tests until PCT bug is fixed g3416906
236+
# - task: MathWorks.matlab-azure-devops-extension-dev.RunMATLABTests.RunMATLABTests@${{ version }}
237+
# displayName: Run MATLAB tests in parallel
238+
# inputs:
239+
# useParallel: true
240+
# sourceFolder: src
241+
# condition: not(eq(${{ version }}, '0'))
242+
# - bash: |
243+
# set -e
244+
# grep -q "Starting parallel pool (parpool)" console.log
245+
# rm console.log
246+
# displayName: Verify tests ran in parallel
247+
# condition: not(eq(${{ version }}, '0'))
254248
- task: MathWorks.matlab-azure-devops-extension-dev.RunMATLABTests.RunMATLABTests@${{ version }}
255249
displayName: Run MATLAB tests with detailed display level for event details
256250
inputs:

overview.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,25 @@ steps:
125125
MLM_LICENSE_TOKEN: $(myToken)
126126
```
127127

128+
### Use Virtual Display on Linux Agent
129+
Microsoft-hosted Linux® agents do not provide a display. To run MATLAB code that requires a display, such as tests that interact with an app UI, first set up a virtual display on the agent by starting an Xvfb display server. For example, set up a virtual server to run the tests for an app created in MATLAB.
130+
131+
```YAML
132+
pool:
133+
vmImage: ubuntu-latest
134+
steps:
135+
- script: |
136+
sudo apt-get install -y xvfb
137+
Xvfb :99 &
138+
echo "##vso[task.setVariable variable=DISPLAY]:99"
139+
displayName: Start virtual display server
140+
condition: eq(variables['Agent.OS'],'Linux')
141+
- task: InstallMATLAB@1
142+
- task: RunMATLABTests@1
143+
```
144+
128145
### Build Across Multiple Platforms
129-
The **Install MATLAB** task supports the Linux®, Windows®, and macOS platforms. Use a `matrix` job strategy to run a build using the MATLAB build tool on all the supported platforms. This pipeline runs three jobs.
146+
The **Install MATLAB** task supports the Linux, Windows®, and macOS platforms. Use a `matrix` job strategy to run a build using the MATLAB build tool on all the supported platforms. This pipeline runs three jobs.
130147

131148
```YAML
132149
strategy:
@@ -159,7 +176,7 @@ Specify the **Install MATLAB** task in your YAML pipeline as `InstallMATLAB@1`.
159176
Input | Description
160177
------------| ------------
161178
`release` | <p>(Optional) MATLAB release to install. You can specify R2021a or a later release. By default, the value of `release` is `latest`, which corresponds to the latest release of MATLAB.</p><p><ul><li>To install the latest update of a release, specify only the release name, for example, `R2023b`.</li><li>To install a specific update release, specify the release name with an update number suffix, for example, `R2023bU4`.</li><li>To install a release without updates, specify the release name with an update 0 or general release suffix, for example, `R2023bU0` or `R2023bGR`.</li></ul></p><p>**Example**: `release: R2023b`<br/>**Example**: `release: latest`<br/>**Example**: `release: R2023bU4`</p>
162-
`products` | <p>(Optional) Products to install in addition to MATLAB, specified as a list of product names separated by spaces. You can specify `products` to set up most MathWorks products and support packages. The action uses [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md) (`mpm`) to set up products.</p><p>For a list of supported products, open the input file for your preferred release from the [`mpm-input-files`](https://github.com/mathworks-ref-arch/matlab-dockerfile/tree/main/mpm-input-files) folder on GitHub&reg;. Specify products using the format shown in the input file, excluding the `#product.` prefix. For example, to set up Deep Learning Toolbox&trade; in addition to MATLAB, specify `products: Deep_Learning_Toolbox`.</p><p>For an example of how to use the `products` input, see [Run Tests in Parallel](#run-tests-in-parallel).</p><p>**Example**: `products: Simulink`<br/>**Example:** `products: Simulink Deep_Learning_Toolbox`</p>
179+
`products` | <p>(Optional) Products to install in addition to MATLAB, specified as a list of product names separated by spaces. You can specify `products` to install most MathWorks products and support packages. The task uses [MATLAB Package Manager](https://github.com/mathworks-ref-arch/matlab-dockerfile/blob/main/MPM.md) (`mpm`) to install products.</p><p>For a list of supported products, open the input file for your preferred release from the [`mpm-input-files`](https://github.com/mathworks-ref-arch/matlab-dockerfile/tree/main/mpm-input-files) folder on GitHub&reg;. Specify products using the format shown in the input file, excluding the `#product.` prefix. For example, to install Deep Learning Toolbox&trade; in addition to MATLAB, specify `products: Deep_Learning_Toolbox`.</p><p>For an example of how to use the `products` input, see [Run Tests in Parallel](#run-tests-in-parallel).</p><p>**Example**: `products: Simulink`<br/>**Example:** `products: Simulink Deep_Learning_Toolbox`</p>
163180

164181
#### Licensing
165182
Product licensing for your pipeline depends on your project visibility as well as the type of products to install:

0 commit comments

Comments
 (0)