Skip to content

Commit 4009eff

Browse files
authored
Merge pull request #100166 from N-Usha/users/ushan-AzurePipelines
Minor YAML indentation changes.
2 parents 5561e55 + b2ff1a4 commit 4009eff

File tree

3 files changed

+34
-28
lines changed

3 files changed

+34
-28
lines changed

articles/virtual-machines/linux/toc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
href: tutorial-monitor.md
4242
- name: 13 - Manage VM security
4343
href: tutorial-azure-security.md
44-
- name: 14 - Deploy Jenkins
44+
- name: 14a - Build with Jenkins
4545
href: tutorial-jenkins-github-docker-cicd.md
46-
- name: 15a - Deploy with Azure Pipelines
46+
- name: 14b - Deploy with Azure Pipelines(Classic)
4747
href: tutorial-build-deploy-jenkins.md
48-
- name: 15b - CI/CD with Azure Pipelines
48+
- name: 15 - CI/CD with Azure Pipelines(YAML)
4949
href: tutorial-build-deploy-azure-pipelines.md
5050
- name: 16a - Create LAMP stack
5151
href: tutorial-lamp-stack.md

articles/virtual-machines/linux/tutorial-build-deploy-azure-pipelines.md

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -150,20 +150,20 @@ Select the **starter** template and copy the below YAML snippet that builds your
150150

151151
```YAML
152152
- job: Build
153-
displayName: Build Maven Project
154-
steps:
155-
- task: Maven@3
156-
displayName: 'Maven Package'
157-
inputs:
158-
mavenPomFile: 'pom.xml'
159-
- task: CopyFiles@2
160-
displayName: 'Copy Files to artifact staging directory'
161-
inputs:
162-
SourceFolder: '$(System.DefaultWorkingDirectory)'
163-
Contents: '**/target/*.?(war|jar)'
164-
TargetFolder: $(Build.ArtifactStagingDirectory)
165-
- upload: $(Build.ArtifactStagingDirectory)
166-
artifact: drop
153+
displayName: Build Maven Project
154+
steps:
155+
- task: Maven@3
156+
displayName: 'Maven Package'
157+
inputs:
158+
mavenPomFile: 'pom.xml'
159+
- task: CopyFiles@2
160+
displayName: 'Copy Files to artifact staging directory'
161+
inputs:
162+
SourceFolder: '$(System.DefaultWorkingDirectory)'
163+
Contents: '**/target/*.?(war|jar)'
164+
TargetFolder: $(Build.ArtifactStagingDirectory)
165+
- upload: $(Build.ArtifactStagingDirectory)
166+
artifact: drop
167167
```
168168
169169
For more guidance, follow the steps mentioned in [Build your Java app with Maven](https://docs.microsoft.com/azure/devops/pipelines/ecosystems/java).
@@ -215,13 +215,13 @@ For more guidance, follow the steps in [Build your Node.js app with gulp](https:
215215
216216
```YAML
217217
jobs:
218-
- deployment: VMDeploy
219-
displayName: web
220-
environment:
221-
name: <environment name>
222-
resourceType: VirtualMachine
223-
tags: web1
224-
strategy:
218+
- deployment: VMDeploy
219+
displayName: web
220+
environment:
221+
name: <environment name>
222+
resourceType: VirtualMachine
223+
tags: web1
224+
strategy:
225225
```
226226
2. You can select specific sets of virtual machines from the environment to receive the deployment by specifying the **tags** that you have defined for each virtual machine in the environment.
227227
[Here](https://docs.microsoft.com/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema#deployment-job) is the complete YAML schema for Deployment job.
@@ -258,7 +258,7 @@ For more guidance, follow the steps in [Build your Node.js app with gulp](https:
258258
resourceType: VirtualMachine
259259
strategy:
260260
rolling:
261-
maxParallel: 2 #for percentages, mention as x%
261+
maxParallel: 5 #for percentages, mention as x%
262262
preDeploy:
263263
steps:
264264
- download: current
@@ -300,3 +300,7 @@ Deployments view of the environment provides complete traceability of commits an
300300
## Next steps
301301
- You can proceed to [customize the pipeline](https://docs.microsoft.com/azure/devops/pipelines/customize-pipeline) you just created.
302302
- To learn what else you can do in YAML pipelines, see [YAML schema reference](https://docs.microsoft.com/azure/devops/pipelines/yaml-schema).
303+
- To learn about how to deploy a LAMP (Linux, Apache, MySQL, and PHP) stack, advance to the next tutorial.
304+
305+
> [!div class="nextstepaction"]
306+
> [Deploy LAMP stack](tutorial-lamp-stack.md)

articles/virtual-machines/linux/tutorial-build-deploy-jenkins.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,11 @@ In this tutorial, you automated the deployment of an app to Azure by using Jenki
181181
> * Build your app in Jenkins.
182182
> * Configure Jenkins for Azure DevOps Services integration.
183183
> * Create a deployment group for the Azure virtual machines.
184-
> * Create a release pipeline that configures the VMs and deploys the app.
184+
> * Create an Azure Pipeline that configures the VMs and deploys the app.
185185
186-
To learn about how to deploy a LAMP (Linux, Apache, MySQL, and PHP) stack, advance to the next tutorial.
186+
To learn about how to use Azure Pipelines for both Build and Release steps, refer to [this](https://docs.microsoft.com/azure/devops/pipelines/apps/cd/deploy-linuxvm-deploygroups).
187+
188+
To learn about how to author a YAML based CI/CD pipeline to deploy to VMs, advance to the next tutorial.
187189

188190
> [!div class="nextstepaction"]
189-
> [Deploy LAMP stack](tutorial-lamp-stack.md)
191+
> [CI/CD using Azure Pipelines](tutorial-build-deploy-azure-pipelines.md)

0 commit comments

Comments
 (0)