Skip to content

Commit e521b95

Browse files
authored
Merge pull request #105482 from TomArcherMsft/jenkins-task-380-container-instances
Move Jenkins files to Jenkins dir for repo migration (container instances)
2 parents eee2bfd + 0ed7f12 commit e521b95

19 files changed

+11
-10
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48926,6 +48926,11 @@
4892648926
"source_path": "articles/virtual-machines/linux/tutorial-jenkins-github-docker-cicd.md",
4892748927
"redirect_url": "/azure/jenkins/tutorial-jenkins-github-docker-cicd",
4892848928
"redirect_document_id": false
48929+
},
48930+
{
48931+
"source_path": "articles/container-instances/container-instances-jenkins.md",
48932+
"redirect_url": "/azure/jenkins/container-instances-jenkins",
48933+
"redirect_document_id": false
4892948934
}
4893048935
]
4893148936
}

articles/container-instances/container-instances-jenkins.md renamed to articles/jenkins/container-instances-jenkins.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ms.date: 08/31/2018
99

1010
Azure Container Instances (ACI) provides an on-demand, burstable, and isolated environment for running containerized workloads. Because of these attributes, ACI makes a great platform for running Jenkins build jobs at a large scale. This article walks through deploying and using a Jenkins server that's pre-configured with ACI as a build target.
1111

12-
For more information on Azure Container Instances, see [About Azure Container Instances][about-aci].
12+
For more information on Azure Container Instances, see [About Azure Container Instances](../container-instances/container-instances-overview.md).
1313

1414
## Deploy a Jenkins server
1515

@@ -38,7 +38,7 @@ For more information on Azure Container Instances, see [About Azure Container In
3838

3939
![Additional settings for Jenkins portal deployment](./media/container-instances-jenkins/jenkins-portal-02.png)
4040

41-
4. For service principal integration, select **Auto(MSI)** to have [managed identities for Azure resources][managed-identities-azure-resources] automatically create an authentication identity for the Jenkins instance. Select **Manual** to provide your own service principal credentials.
41+
4. For service principal integration, select **Auto(MSI)** to have [managed identities for Azure resources](../active-directory/managed-identities-azure-resources/overview.md) automatically create an authentication identity for the Jenkins instance. Select **Manual** to provide your own service principal credentials.
4242

4343
5. Cloud agents configure a cloud-based platform for Jenkins build jobs. For the sake of this article, select **ACI**. With the ACI cloud agent, each Jenkins build job is run in a container instance.
4444

@@ -124,9 +124,5 @@ If you encounter any bugs with the Jenkins plugins, file an issue in the [Jenkin
124124

125125
## Next steps
126126

127-
To learn more about Jenkins on Azure, see [Azure and Jenkins][jenkins-azure].
128-
129-
<!-- LINKS - internal -->
130-
[about-aci]: ./container-instances-overview.md
131-
[jenkins-azure]: ../jenkins/overview.md
132-
[managed-identities-azure-resources]: ../active-directory/managed-identities-azure-resources/overview.md
127+
> [!div class="nextstepaction"]
128+
> [CI/CD to Azure App Service](java-deploy-webapp-tutorial.md)

articles/jenkins/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ landingContent:
4848
- linkListType: tutorial
4949
links:
5050
- text: Scale with Azure Container Instances
51-
url: /azure/container-instances/container-instances-jenkins?toc=/azure/jenkinstoc.json&bc=/azure/bread/toc.json
51+
url: container-instances-jenkins.md
5252
- text: Scale with Azure VM agents
5353
url: jenkins-azure-vm-agents.md
5454

0 commit comments

Comments
 (0)