Skip to content

Commit 5bd2eed

Browse files
authored
Merge pull request #105401 from TomArcherMsft/jenkins-task-380
Jenkins - Task 380
2 parents a6fd785 + cf2cbd7 commit 5bd2eed

File tree

22 files changed

+217
-232
lines changed

22 files changed

+217
-232
lines changed

.openpublishing.redirection.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48887,10 +48887,20 @@
4888748887
"redirect_url": "/azure/chef/chef-automation",
4888848888
"redirect_document_id": true
4888948889
},
48890-
{
48891-
"source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
48892-
"redirect_url": "/azure/azure-monitor/overview",
48893-
"redirect_document_id": false
48894-
}
48890+
{
48891+
"source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
48892+
"redirect_url": "/azure/azure-monitor/overview",
48893+
"redirect_document_id": false
48894+
},
48895+
{
48896+
"source_path": "articles/virtual-machines/linux/tutorial-build-deploy-jenkins.md",
48897+
"redirect_url": "/azure/jenkins/tutorial-build-deploy-jenkins",
48898+
"redirect_document_id": true
48899+
},
48900+
{
48901+
"source_path": "articles/virtual-machines/linux/tutorial-jenkins-github-docker-cicd.md",
48902+
"redirect_url": "/azure/jenkins/tutorial-jenkins-github-docker-cicd",
48903+
"redirect_document_id": false
48904+
}
4889548905
]
4889648906
}

articles/ansible/ansible-create-configure-mysql.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ms.date: 04/30/2019
1818
>
1919
> * Create a MySql server
2020
> * Create a MySql database
21-
> * Configure a filewall rule so that an external app can connect to your server
21+
> * Configure a firewall rule so that an external app can connect to your server
2222
> * Connect to your MySql server from the Azure cloud shell
2323
> * Query your available MySQL servers
2424
> * List all databases in your connected servers

articles/docker/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ ms.author: gwallace
2727
<ol>
2828
<li><a href="/azure/app-service/containers/tutorial-python-postgresql-app">Build Python and PostgreSQL with Docker</a></li>
2929
<li><a href="/azure/container-service/container-service-docker-swarm-mode-setup-ci-cd-acs-engine">CI/CD with Docker Swarm and Azure DevOps Services</a></li>
30-
<li><a href="/azure/virtual-machines/linux/tutorial-jenkins-github-docker-cicd">Integrate Docker, Jenkins, and Linux VMs</a></li>
30+
<li><a href="/azure/jenkins/tutorial-jenkins-github-docker-cicd">Integrate Docker, Jenkins, and Linux VMs</a></li>
3131
</ol>
3232
<h2>Resources</h2>
3333
<p>See the following links for additional reference materials and tools for working with Docker on Azure.</p>

articles/docker/toc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
- name: CI/CD with Docker Swarm and Azure DevOps
1313
href: /azure/container-service/container-service-docker-swarm-mode-setup-ci-cd-acs-engine
1414
- name: CI/CD with Docker, Jenkins, and Linux
15-
href: /azure/virtual-machines/linux/tutorial-jenkins-github-docker-cicd
15+
href: /azure/jenkins/tutorial-jenkins-github-docker-cicd
1616
- name: How-to guides
1717
items:
1818
- name: Docker VM extension

articles/guides/operations/TOC.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
- name: Create & manage Linux VMs
4040
href: ../../virtual-machines/linux/tutorial-manage-vm.md?toc=%2fazure%2fguides%2foperations%2ftoc.json
4141
- name: Jenkins CI/CD Pipeline
42-
href: ../../virtual-machines/linux/tutorial-jenkins-github-docker-cicd.md?toc=%2fazure%2fguides%2foperations%2ftoc.json
42+
href: ../../jenkins/tutorial-jenkins-github-docker-cicd.md?toc=%2fazure%2fguides%2foperations%2ftoc.json
4343
- name: Load balance VMs
4444
href: ../../virtual-machines/linux/tutorial-load-balancer.md?toc=%2fazure%2fguides%2foperations%2ftoc.json
4545
- name: Authoring Azure Resource Manager templates

articles/jenkins/index.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ metadata:
1111
ms.topic: landing-page
1212
author: TomArcherMsft
1313
ms.author: tarcher
14-
ms.date: 09/17/2019
14+
ms.date: 02/24/2020
1515

1616
landingContent:
1717
# Card
@@ -92,7 +92,7 @@ landingContent:
9292
- linkListType: tutorial
9393
links:
9494
- text: Deploy to a Linux VM using Azure DevOps Services
95-
url: /azure/virtual-machines/linux/tutorial-build-deploy-jenkins?toc=/azure/jenkinstoc.json&bc=/azure/bread/toc.json
95+
url: tutorial-build-deploy-jenkins.md
9696

9797
# Card
9898
- title: CI/CD to Azure Storage
@@ -108,7 +108,7 @@ landingContent:
108108
- linkListType: tutorial
109109
links:
110110
- text: Create a dev infrastructure on a Linux VM
111-
url: /azure/virtual-machines/linux/tutorial-jenkins-github-docker-cicd?toc=/azure/jenkinstoc.json&bc=/azure/bread/toc.json
111+
url: tutorial-jenkins-github-docker-cicd.md
112112

113113
# Card
114114
- title: CI/CD to Service Fabric

0 commit comments

Comments
 (0)