Merge pull request #106366 from TomArcherMsft/jenkins-user-story-1686377

Jenkins: User Story 1686377

Author: megvanhuygen

.openpublishing.redirection.json

@@ -49199,5 +49199,10 @@
       "redirect_url": "/azure/jenkins/service-fabric-cicd-your-linux-applications-with-jenkins",
       "redirect_document_id": true
     },
+    {
+      "source_path": "articles/jenkins/install-jenkins-solution-template.md",
+      "redirect_url": "/azure/jenkins/install-solution-template-tutorial",
+      "redirect_document_id": true
+    }
   ]
 }

articles/jenkins/index.yml

@@ -36,7 +36,7 @@ landingContent:
       - linkListType: quickstart
         links:
           - text: Create a Jenkins server
-            url: install-jenkins-solution-template.md
+            url: install-solution-template-quickstart.md
       - linkListType: download
         links:
         - text: Sample jobs and scripts

articles/jenkins/install-solution-template-quickstart.md

@@ -0,0 +1,13 @@
+---
+title: Quickstart - Create a Jenkins server on Azure
+description: In this quickstart, you install Jenkins on an Azure Linux virtual machine from the Jenkins solution template and build a sample Java application.
+keywords: jenkins, azure, devops, portal, virtual machine, solution template
+ms.topic: quickstart
+ms.date: 03/03/2020
+---
+
+# Quickstart: Create a Jenkins server on an Azure Linux VM
+
+This quickstart shows how to install [Jenkins](https://jenkins.io) on an Ubuntu Linux VM with the tools and plug-ins configured to work with Azure. When you're finished, you have a Jenkins server running in Azure building a sample Java app from [GitHub](https://github.com).
+
+[!INCLUDE [jenkins-install-solution-template-include](../../includes/jenkins-install-solution-template-steps.md)]

articles/jenkins/install-solution-template-tutorial.md

@@ -0,0 +1,19 @@
+---
+title: Tutorial - Create a Jenkins server on Azure
+description: In this tutorial, you install Jenkins on an Azure Linux virtual machine from the Jenkins solution template and build a sample Java application.
+keywords: jenkins, azure, devops, portal, virtual machine, solution template
+ms.topic: tutorial
+ms.date: 03/03/2020
+---
+
+# Tutorial: Create a Jenkins server on an Azure Linux VM 
+
+This tutorial shows how to install [Jenkins](https://jenkins.io) on an Ubuntu Linux VM with the tools and plug-ins configured to work with Azure. When you're finished, you have a Jenkins server running in Azure building a sample Java app from [GitHub](https://github.com).
+
+> [!div class="checklist"]
+> * Install and configure a Jenkins server on Azure
+> * Access the Jenkins console using an SSH tunnel
+> * Create a Freestyle project
+> * Compile the code and package the sample app
+
+[!INCLUDE [jenkins-install-solution-template-include](../../includes/jenkins-install-solution-template-steps.md)]

articles/jenkins/toc.yml

@@ -8,13 +8,13 @@
   expanded: true
   items:
   - name: Create a Jenkins server
-    href: install-jenkins-solution-template.md
+    href: install-solution-template-quickstart.md
 - name: Tutorials
   items:
   - name: 1. Install
     items:
     - name: Create a Jenkins server
-      href: install-jenkins-solution-template.md
+      href: install-solution-template-tutorial.md
   - name: 2. Configure
     items:
     - name: Scale with Azure Container Instances

articles/jenkins/install-jenkins-solution-template.md renamed to includes/jenkins-install-solution-template-steps.md

@@ -1,88 +1,84 @@
----
-title: Create a Jenkins server on Azure
-description: Install Jenkins on an Azure Linux virtual machine from the Jenkins solution template and build a sample Java application.
-keywords: jenkins, azure, devops, portal, virtual machine, solution template
-ms.topic: quickstart
-ms.date: 6/7/2017
----
-
-# Create a Jenkins server on an Azure Linux VM from the Azure portal
-
-This quickstart shows how to install [Jenkins](https://jenkins.io) on an Ubuntu Linux VM with the tools and plug-ins configured to work with Azure. When you're finished, you have a Jenkins server running in Azure building a sample Java app from [GitHub](https://github.com).
-
-## Prerequisites
-
-* An Azure subscription
-* Access to SSH on your computer's command line (such as the Bash shell or [PuTTY](https://www.putty.org/))
-
-[!INCLUDE [quickstarts-free-trial-note](../../includes/quickstarts-free-trial-note.md)]
-
-## Create the Jenkins VM from the solution template
-Jenkins supports a model where the Jenkins server delegates work to one or more agents to allow a single Jenkins installation to host a large number of projects or to provide different environments needed for builds or tests. The steps in this section guide you through installing and configuring a Jenkins server on Azure.
-
-[!INCLUDE [jenkins-install-from-azure-marketplace-image](../../includes/jenkins-install-from-azure-marketplace-image.md)]
-
-## Connect to Jenkins
-
-Navigate to your virtual machine (for example, `http://jenkins2517454.eastus.cloudapp.azure.com/`) in  your web browser. The Jenkins console is inaccessible through unsecured HTTP so instructions are provided on the page to access the Jenkins console securely from your computer using an SSH tunnel.
-
-![Unlock jenkins](./media/install-jenkins-solution-template/jenkins-ssh-instructions.png)
-
-Set up the tunnel using the `ssh` command on the page from the command line, replacing `username` with the name of the virtual machine admin user chosen earlier when setting up the virtual machine from the solution template.
-
-```bash
-ssh -L 127.0.0.1:8080:localhost:8080 [email protected]
-```
-
-After you have started the tunnel, navigate to `http://localhost:8080/` on your local machine. 
-
-Get the initial password by running the following command in the command line while connected through SSH to the Jenkins VM.
-
-```bash
-sudo cat /var/lib/jenkins/secrets/initialAdminPassword
-```
-
-Unlock the Jenkins dashboard for the first time using this initial password.
-
-![Unlock jenkins](./media/install-jenkins-solution-template/jenkins-unlock.png)
-
-Select **Install suggested plugins** on the next page and then create a Jenkins admin user used to access the Jenkins dashboard.
-
-![Jenkins is ready!](./media/install-jenkins-solution-template/jenkins-welcome.png)
-
-The Jenkins server is now ready to build code.
-
-## Create your first job
-
-Select **Create new jobs** from the Jenkins console, then name it **mySampleApp** and select **Freestyle project**, then select **OK**.
-
-![Create a new job](./media/install-jenkins-solution-template/jenkins-new-job.png) 
-
-Select the **Source Code Management** tab, enable **Git**, and enter the following URL in **Repository URL**  field: `https://github.com/spring-guides/gs-spring-boot.git`
-
-![Define the Git repo](./media/install-jenkins-solution-template/jenkins-job-git-configuration.png) 
-
-Select the **Build** tab, then select **Add build step**, **Invoke Gradle script**. Select **Use Gradle Wrapper**, then enter `complete` in **Wrapper location** and `build` for **Tasks**.
-
-![Use the Gradle wrapper to build](./media/install-jenkins-solution-template/jenkins-job-gradle-config.png) 
-
-Select **Advanced** and then enter `complete` in the **Root Build script** field. Select **Save**.
-
-![Set advanced settings in the Gradle wrapper build step](./media/install-jenkins-solution-template/jenkins-job-gradle-advances.png) 
-
-## Build the code
-
-Select **Build Now** to compile the code and package the sample app. When your build completes, select the **Workspace** link for the project.
-
-![Browse to the workspace to get the JAR file from the build](./media/install-jenkins-solution-template/jenkins-access-workspace.png) 
-
-Navigate to `complete/build/libs` and ensure the `gs-spring-boot-0.1.0.jar` is there to verify that your build was successful. Your Jenkins server is now ready to build your own projects in Azure.
-
-## Troubleshooting the Jenkins solution template
-
-If you encounter any bugs with the Jenkins solution template, file an issue in the [Jenkins GitHub repo](https://github.com/azure/jenkins/issues).
-
-## Next Steps
-
-> [!div class="nextstepaction"]
-> [Add Azure VMs as Jenkins agents](jenkins-azure-vm-agents.md)
+---
+author: tomarcher
+ms.service: jenkins
+ms.topic: include
+ms.date: 03/03/2020
+ms.author: tarcher
+---
+
+## Prerequisites
+
+* An Azure subscription
+* Access to SSH on your computer's command line (such as the Bash shell or [PuTTY](https://www.putty.org/))
+
+[!INCLUDE [quickstarts-free-trial-note](quickstarts-free-trial-note.md)]
+
+## Create the Jenkins VM from the solution template
+Jenkins supports a model where the Jenkins server delegates work to one or more agents to allow a single Jenkins installation to host a large number of projects or to provide different environments needed for builds or tests. The steps in this section guide you through installing and configuring a Jenkins server on Azure.
+
+[!INCLUDE [jenkins-install-from-azure-marketplace-image](jenkins-install-from-azure-marketplace-image.md)]
+
+## Connect to Jenkins
+
+Navigate to your virtual machine (for example, `http://jenkins2517454.eastus.cloudapp.azure.com/`) in  your web browser. The Jenkins console is inaccessible through unsecured HTTP so instructions are provided on the page to access the Jenkins console securely from your computer using an SSH tunnel.
+
+![Unlock jenkins](./media/jenkins-install-solution-template-steps/jenkins-ssh-instructions.png)
+
+Set up the tunnel using the `ssh` command on the page from the command line, replacing `username` with the name of the virtual machine admin user chosen earlier when setting up the virtual machine from the solution template.
+
+```bash
+ssh -L 127.0.0.1:8080:localhost:8080 [email protected]
+```
+
+After you have started the tunnel, navigate to `http://localhost:8080/` on your local machine. 
+
+Get the initial password by running the following command in the command line while connected through SSH to the Jenkins VM.
+
+```bash
+sudo cat /var/lib/jenkins/secrets/initialAdminPassword
+```
+
+Unlock the Jenkins dashboard for the first time using this initial password.
+
+![Unlock jenkins](./media/jenkins-install-solution-template-steps/jenkins-unlock.png)
+
+Select **Install suggested plugins** on the next page and then create a Jenkins admin user used to access the Jenkins dashboard.
+
+![Jenkins is ready!](./media/jenkins-install-solution-template-steps/jenkins-welcome.png)
+
+The Jenkins server is now ready to build code.
+
+## Create your first job
+
+Select **Create new jobs** from the Jenkins console, then name it **mySampleApp** and select **Freestyle project**, then select **OK**.
+
+![Create a new job](./media/jenkins-install-solution-template-steps/jenkins-new-job.png) 
+
+Select the **Source Code Management** tab, enable **Git**, and enter the following URL in **Repository URL**  field: `https://github.com/spring-guides/gs-spring-boot.git`
+
+![Define the Git repo](./media/jenkins-install-solution-template-steps/jenkins-job-git-configuration.png) 
+
+Select the **Build** tab, then select **Add build step**, **Invoke Gradle script**. Select **Use Gradle Wrapper**, then enter `complete` in **Wrapper location** and `build` for **Tasks**.
+
+![Use the Gradle wrapper to build](./media/jenkins-install-solution-template-steps/jenkins-job-gradle-config.png) 
+
+Select **Advanced** and then enter `complete` in the **Root Build script** field. Select **Save**.
+
+![Set advanced settings in the Gradle wrapper build step](./media/jenkins-install-solution-template-steps/jenkins-job-gradle-advances.png) 
+
+## Build the code
+
+Select **Build Now** to compile the code and package the sample app. When your build completes, select the **Workspace** link for the project.
+
+![Browse to the workspace to get the JAR file from the build](./media/jenkins-install-solution-template-steps/jenkins-access-workspace.png) 
+
+Navigate to `complete/build/libs` and ensure the `gs-spring-boot-0.1.0.jar` is there to verify that your build was successful. Your Jenkins server is now ready to build your own projects in Azure.
+
+## Troubleshooting the Jenkins solution template
+
+If you encounter any bugs with the Jenkins solution template, file an issue in the [Jenkins GitHub repo](https://github.com/azure/jenkins/issues).
+
+## Next Steps
+
+> [!div class="nextstepaction"]
+> [Add Azure VMs as Jenkins agents](/azure/jenkins-azure-vm-agents)