Merge pull request #105563 from TomArcherMsft/jenkins-task-380-storage

Jenkins: Task 384

Author: American-Dipper

.openpublishing.redirection.json

@@ -27188,8 +27188,8 @@
     },
     {
       "source_path": "articles/storage/storage-java-jenkins-continuous-integration-solution.md",
-      "redirect_url": "/azure/storage/common/storage-java-jenkins-continuous-integration-solution",
-      "redirect_document_id": true
+      "redirect_url": "/azure/jenkins/storage-java-jenkins-continuous-integration-solution",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/storage/storage-manage-access-to-resources.md",
@@ -48936,6 +48936,11 @@
       "source_path": "articles/aks/jenkins-continuous-deployment.md",
       "redirect_url": "/azure/jenkins/jenkins-continuous-deployment",
       "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/storage/common/storage-java-jenkins-continuous-integration-solution.md",
+      "redirect_url": "/azure/jenkins/storage-java-jenkins-continuous-integration-solution",
+      "redirect_document_id": false
     }
   ]
 }

articles/jenkins/index.yml

@@ -100,7 +100,7 @@ landingContent:
       - linkListType: tutorial
         links:
           - text: Using Azure Storage with a Jenkins C/I solution
-            url: /azure/storage/storage-java-jenkins-continuous-integration-solution?toc=/azure/jenkinstoc.json&bc=/azure/bread/toc.json
+            url: storage-java-jenkins-continuous-integration-solution.md
 
   # Card
   - title: CI/CD to Linux VMs

articles/jenkins/overview.md

@@ -28,7 +28,7 @@ Add build agents to your existing Jenkins deployment to scale your Jenkins build
 
 Once configured with an [Azure service principal](/azure/azure-resource-manager/resource-group-overview), Jenkins jobs and pipelines can use this credential to:
 
-- Securely store and archive build artifacts in [Azure Storage](/azure/storage/common/storage-introduction) using the [Azure Storage plug-in](https://plugins.jenkins.io/windows-azure-storage). Review the [Jenkins storage how-to](/azure/storage/common/storage-java-jenkins-continuous-integration-solution) to learn more.
+- Securely store and archive build artifacts in [Azure Storage](/azure/storage/common/storage-introduction) using the [Azure Storage plug-in](https://plugins.jenkins.io/windows-azure-storage). Review the [Jenkins storage how-to](storage-java-jenkins-continuous-integration-solution.md) to learn more.
 - Manage and configure Azure resources with the [Azure CLI](/azure/jenkins/execute-cli-jenkins-pipeline).
 
 ## Deploy your code into Azure services

articles/storage/common/storage-java-jenkins-continuous-integration-solution.md renamed to articles/jenkins/storage-java-jenkins-continuous-integration-solution.md

@@ -1,15 +1,9 @@
 ---
 title: Using Azure Storage with a Jenkins continuous integration solution
 description: This tutorial shows how to use the Azure blob service as a repository for build artifacts created by a Jenkins continuous integration solution.
+keywords: jenkins, azure, devops, storage, cicd
 ms.topic: article
-ms.author: tarcher
-
-author: tarcher
-services: devops
-ms.service: storage
-custom: jenkins
 ms.date: 08/13/2019
-ms.subservice: common
 ---
 
 # Using Azure Storage with a Jenkins continuous integration solution
@@ -19,11 +13,13 @@ This article illustrates how to use Blob storage as a repository of build artifa
 In this tutorial, you will be using the Azure Storage Plugin for Jenkins CI made available by Microsoft.
 
 ## Jenkins overview
+
 Jenkins enables continuous integration of a software project by allowing developers to easily integrate their code changes and have builds produced automatically and frequently, thereby increasing the productivity of the developers. Builds are versioned, and build artifacts can be uploaded to various repositories. This article shows how to use Azure blob storage as the repository of the build artifacts. It will also show how to download dependencies from Azure blob storage.
 
 More information about Jenkins can be found at [Meet Jenkins](https://wiki.jenkins-ci.org/display/JENKINS/Meet+Jenkins).
 
 ## Benefits of using the Blob service
+
 Benefits of using the Blob service to host your agile development build artifacts include:
 
 * High availability of your build artifacts and/or downloadable dependencies.
@@ -32,6 +28,7 @@ Benefits of using the Blob service to host your agile development build artifact
 * Control over user access policies, with a choice between anonymous access, expiration-based shared access signature access, private access, etc.
 
 ## Prerequisites
+
 * A Jenkins continuous integration solution.
 
     If you currently don't have a Jenkins CI solution, you can run a Jenkins CI solution using the following technique:
@@ -45,7 +42,7 @@ Benefits of using the Blob service to host your agile development build artifact
 
       While a typical Jenkins CI solution would be set up to run as a service, running the Jenkins war at the command line will be sufficient for this tutorial.
 * An Azure account. You can sign up for an Azure account at <https://www.azure.com>.
-* An Azure storage account. If you don't already have a storage account, you can create one using the steps at [Create a Storage Account](../common/storage-account-create.md).
+* An Azure storage account. If you don't already have a storage account, you can create one using the steps at [Create a Storage Account](../storage/common/storage-account-create.md).
 * Familiarity with the Jenkins CI solution is recommended but not required, as the following content will use a basic example to show you the steps needed when using the Blob service as a repository for Jenkins CI build artifacts.
 
 ## How to use the Blob service with Jenkins CI
@@ -93,7 +90,7 @@ For instructional purposes, you first need to create a job that will create seve
     **Tip**
 
     Below the **Command** section where you entered a script for **Execute Windows batch command** is a link to the environment variables recognized by Jenkins. Select that link to learn the environment variable names and descriptions. Environment variables that contain special characters, such as the **BUILD_URL** environment variable, are not allowed as a container name or common virtual path.
-8. Select **Make new container public by default** for this example. (If you want to use a private container, you'll need to create a shared access signature to allow access, which is beyond the scope of this article. You can learn more about shared access signatures at [Using Shared Access Signatures (SAS)](storage-sas-overview.md).)
+8. Select **Make new container public by default** for this example. (If you want to use a private container, you'll need to create a shared access signature to allow access, which is beyond the scope of this article. You can learn more about shared access signatures at [Using Shared Access Signatures (SAS)](../storage/common/storage-sas-overview.md).)
 9. [Optional] Select **Clean container before uploading** if you want the container to be cleared of contents before build artifacts are uploaded (leave it unchecked if you do not want to clean the contents of the container).
 10. For **List of Artifacts to upload**, enter `text/*.txt`.
 11. For **Common virtual path for uploaded artifacts**, for purposes of this tutorial, enter `${BUILD\_ID}/${BUILD\_NUMBER}`.
@@ -142,10 +139,6 @@ This section provides an overview of the Blob service components.
 If you encounter any bugs with the Jenkins plugins, file an issue in the [Jenkins JIRA](https://issues.jenkins-ci.org/) for the specific component.
 
 ## Next steps
-* [Meet Jenkins](https://wiki.jenkins-ci.org/display/JENKINS/Meet+Jenkins)
-* [Azure Storage SDK for Java](https://github.com/azure/azure-storage-java)
-* [Azure Storage Client SDK Reference](https://javadoc.io/doc/com.microsoft.azure/azure-core/0.8.0/index.html)
-* [Azure Storage Services REST API](https://msdn.microsoft.com/library/azure/dd179355.aspx)
-* [Azure Storage Team Blog](https://blogs.msdn.com/b/windowsazurestorage/)
 
-For more information, visit [Azure for Java developers](/java/azure).
+> [!div class="nextstepaction"]
+> [Jenkins on Azure](/azure/Jenkins/)

articles/jenkins/toc.yml

@@ -49,7 +49,7 @@
     - name: Deploy to Azure Functions
       href: jenkins-azure-functions-deploy.md
     - name: Publish to Azure Storage
-      href: /azure/storage/storage-java-jenkins-continuous-integration-solution
+      href: storage-java-jenkins-continuous-integration-solution.md
       maintainContext: true
     - name: CI/CD to Linux VMs
       href: tutorial-jenkins-github-docker-cicd.md

articles/virtual-machines/linux/toc.yml

@@ -534,7 +534,7 @@
       - name: Scale with VM agents
         href: ../../jenkins/jenkins-azure-vm-agents.md
       - name: Publish artifacts to Storage
-        href: ../../storage/common/storage-java-jenkins-continuous-integration-solution.md
+        href: ../../jenkins/storage-java-jenkins-continuous-integration-solution.md
       - name: Secure Jenkins
         href: https://jenkins.io/blog/2017/04/20/secure-jenkins-on-azure/
   - name: Run containers