Skip to content

Commit 847d2d8

Browse files
committed
Jenkins - Task 380
1 parent 4a4959d commit 847d2d8

22 files changed

+213
-228
lines changed

.openpublishing.redirection.json

+15-5
Original file line numberDiff line numberDiff line change
@@ -48891,10 +48891,20 @@
4889148891
"redirect_url": "/azure/chef/chef-automation",
4889248892
"redirect_document_id": true
4889348893
},
48894-
{
48895-
"source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
48896-
"redirect_url": "/azure/azure-monitor/overview",
48897-
"redirect_document_id": false
48898-
}
48894+
{
48895+
"source_path": "articles/azure-monitor/app/hockeyapp-bridge-app.md",
48896+
"redirect_url": "/azure/azure-monitor/overview",
48897+
"redirect_document_id": false
48898+
},
48899+
{
48900+
"source_path": "articles/virtual-machines/linux/tutorial-build-deploy-jenkins.md",
48901+
"redirect_url": "/azure/jenkins/tutorial-build-deploy-jenkins",
48902+
"redirect_document_id": true
48903+
},
48904+
{
48905+
"source_path": "articles/virtual-machines/linux/tutorial-jenkins-github-docker-cicd.md",
48906+
"redirect_url": "/azure/jenkins/tutorial-jenkins-github-docker-cicd",
48907+
"redirect_document_id": false
48908+
}
4889948909
]
4890048910
}

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

+1-1
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

+1-1
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

+1-1
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

+1-1
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

+3-3
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

articles/jenkins/overview.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ This article is an introduction to using Azure with Jenkins, detailing the core
1717
Host Jenkins in Azure to centralize your build automation and scale your deployment as the needs of your software projects grow. You can deploy Jenkins in Azure using:
1818

1919
- [The Jenkins solution template](install-jenkins-solution-template.md) in Azure Marketplace.
20-
- [Azure virtual machines](/azure/virtual-machines/linux/overview). See our [tutorial](/azure/virtual-machines/linux/tutorial-jenkins-github-docker-cicd) to create a Jenkins instance on a VM.
20+
- [Azure virtual machines](/azure/virtual-machines/linux/overview). See our [tutorial](tutorial-jenkins-github-docker-cicd.md) to create a Jenkins instance on a VM.
2121
- On a Kubernetes cluster running in [Azure Container Service](/azure/container-service/kubernetes/container-service-kubernetes-walkthrough), see our [how-to](/azure/container-service/kubernetes/container-service-kubernetes-jenkins).
2222

2323
Monitor and manage your Azure Jenkins deployment using [Azure Monitor logs](/azure/log-analytics/log-analytics-overview) and the [Azure CLI](/cli/azure).

articles/jenkins/toc.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@
4444
- name: Deploy an app from GitHub to App Service
4545
href: tutorial-jenkins-deploy-web-app-azure-app-service.md
4646
- name: Use Jenkins with Azure DevOps
47-
href: /azure/virtual-machines/linux/tutorial-build-deploy-jenkins
47+
href: tutorial-build-deploy-jenkins.md
4848
maintainContext: true
4949
- name: Deploy to Azure Functions
5050
href: jenkins-azure-functions-deploy.md
5151
- name: Publish to Azure Storage
5252
href: /azure/storage/storage-java-jenkins-continuous-integration-solution
5353
maintainContext: true
5454
- name: CI/CD to Linux VMs
55-
href: /azure/virtual-machines/linux/tutorial-jenkins-github-docker-cicd
55+
href: tutorial-jenkins-github-docker-cicd.md
5656
maintainContext: true
5757
- name: CI/CD to Service Fabric
5858
href: /azure/service-fabric/service-fabric-cicd-your-linux-applications-with-jenkins

0 commit comments

Comments
 (0)