Merge pull request #50170 from TomArcher/jenkins-metadata-normalize

Ja-Dunn · web-flow · commit e83584b4a3a2 · 2018-08-27T15:28:25.000-07:00
Jenkins - Updating metadata
diff --git a/articles/jenkins/deploy-jenkins-app-service-plugin.md b/articles/jenkins/deploy-jenkins-app-service-plugin.md
@@ -1,12 +1,12 @@
 ---
 title: Deploy to Azure App Service by using the Jenkins plugin
 description: Learn how to use the Azure App Service Jenkins plugin to deploy a Java web app to Azure in Jenkins
-ms.topic: article
-ms.author: tarcher
+ms.service: jenkins
+keywords: jenkins, azure, devops, app service
 author: tomarcher
-manager: jpconnock
-ms.service: devops
-ms.custom: jenkins
+manager: jeconnoc
+ms.author: tarcher
+ms.topic: tutorial
 ms.date: 07/31/2018
 ---
 
@@ -35,7 +35,7 @@ You can use the Jenkins plugin to deploy a web app in any language that is suppo
 > [!NOTE]
 > The Java JDK and Maven are required to build the Java project. Install these components on the Jenkins Master, or on the VM agent if you use the agent for continuous integration. 
 
-To install the components, log in to the Jenkins instance with SSH and run the following commands:
+To install the components, sign in to the Jenkins instance with SSH and run the following commands:
 
 ```bash
 sudo apt-get install -y openjdk-7-jdk
@@ -128,7 +128,7 @@ Web Apps on Linux also supports traditional deployment methods, like Git and FTP
 Before setting up the job in Jenkins, you need a web app on Linux. You also need a container registry to store and manage your private Docker container images. You can use DockerHub to create the container registry. In this example, we use Azure Container Registry.
 
 * [Create your web app on Linux](../app-service/containers/quickstart-nodejs.md).
-* Azure Container Registry is a managed [Docker Registry](https://docs.docker.com/registry/) service that is based on the open source Docker Registry version 2.0. [Create an Azure container registry](/azure/container-registry/container-registry-get-started-azure-cli). You can also use DockerHub.
+* Azure Container Registry is a managed [Docker Registry](https://docs.docker.com/registry/) service that is based on the open-source Docker Registry version 2.0. [Create an Azure container registry](/azure/container-registry/container-registry-get-started-azure-cli). You can also use DockerHub.
 
 ### Set up the Jenkins job for Docker
 
diff --git a/articles/jenkins/execute-cli-jenkins-pipeline.md b/articles/jenkins/execute-cli-jenkins-pipeline.md
@@ -1,21 +1,13 @@
 ---
-title: Execute the Azure CLI with Jenkins | Microsoft Docs
+title: Execute the Azure CLI with Jenkins
 description: Learn how to use Azure CLI to deploy a Java web app to Azure in Jenkins Pipeline
-services: app-service\web
-documentationcenter: ''
-author: mlearned
-manager: douge
-editor: ''
-
-ms.assetid: 
 ms.service: jenkins
-ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: web
+keywords: jenkins, azure, devops, app service, cli
+author: tomarcher
+manager: jeconnoc
+ms.author: tarcher
+ms.topic: tutorial
 ms.date: 6/7/2017
-ms.author: mlearned
-ms.custom: Jenkins
 ---
 
 # Deploy to Azure App Service with Jenkins and the Azure CLI
@@ -42,7 +34,7 @@ Ensure you have version 1.2 or later:
 * Within the Jenkins dashboard, click **Manage Jenkins -> Plugin Manager ->** and search for **Azure Credential**. 
 * Update the plugin if the version is earlier than 1.2.
 
-Java JDK and Maven are also required in the Jenkins master. To install, log in to Jenkins master using SSH and run the following commands:
+Java JDK and Maven are also required in the Jenkins master. To install, sign in to Jenkins master using SSH and run the following commands:
 ```bash
 sudo apt-get install -y openjdk-7-jdk
 sudo apt-get install -y maven
diff --git a/articles/jenkins/index.yml b/articles/jenkins/index.yml
@@ -2,18 +2,15 @@
 documentType: LandingData
 title: Jenkins on Azure
 metadata:
-    description: Deploy and integrate Jenkins with Azure 
-    services: multiple
-    author: rloutlaw
-    manager: justhe
-    layout: LandingPage
-    ms.service: multiple
-    ms.tgt_pltfrm: na
-    ms.devlang: devops
-    ms.topic: landing-page
-    ms.date: 11/01/2017
-    ms.author: routlaw
-    ms.custom: Jenkins
+  title: Jenkins in Azure Documentation - Tutorials, samples, reference, and resources
+  description: Deploy and integrate Jenkins with Azure 
+  ms.service: jenkins
+  keywords: jenkins, azure, devops, tutorials, samples, reference
+  author: tomarcher
+  manager: jeconnoc
+  ms.author: tarcher
+  ms.topic: landing-page
+  ms.date: 08/27/2018
 abstract:
     description: Use the open-source Jenkins server to build your apps in the cloud and deploy them to Azure. Learn how to install, configure, and scale Jenkins on Azure and set up continuous integration (CI) for your apps with our quickstarts, tutorials, and sample pipelines.
     aside: 
diff --git a/articles/jenkins/install-jenkins-solution-template.md b/articles/jenkins/install-jenkins-solution-template.md
@@ -1,13 +1,13 @@
 ---
 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.
-ms.topic: quickstart
-ms.author: tarcher
+ms.service: jenkins
+keywords: jenkins, azure, devops, portal, virtual machine, solution template
 author: tomarcher
-manager: jpconnock
-ms.service: devops
-ms.custom: jenkins
-ms.date: 07/31/2018
+manager: jeconnoc
+ms.author: tarcher
+ms.topic: quickstart
+ms.date: 6/7/2017
 ---
 
 # Create a Jenkins server on an Azure Linux VM from the Azure portal
@@ -70,7 +70,7 @@ Select the **Build** tab, then select **Add build step**, **Invoke Gradle script
 
 ![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**.
+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) 
 
diff --git a/articles/jenkins/java-deploy-webapp-tutorial.md b/articles/jenkins/java-deploy-webapp-tutorial.md
@@ -1,12 +1,12 @@
 ---
 title: Use Jenkins to deploy your web apps to Azure
 description: Set up continuous integration from GitHub to Azure App Service for your Java web apps using Jenkins and Docker.
-ms.topic: tutorial
-ms.author: tarcher
+ms.service: jenkins
+keywords: jenkins, azure, devops, app service, continuous integration, ci, continuous deployment, cd
 author: tomarcher
-manager: jpconnock
-ms.service: devops
-ms.custom: jenkins
+manager: jeconnoc
+ms.author: tarcher
+ms.topic: tutorial
 ms.date: 07/31/2018
 ---
 
@@ -28,7 +28,7 @@ You will perform the following tasks in this tutorial:
 
 To complete this tutorial, you need:
 
-* [Jenkins](https://jenkins.io/) with JDK and Maven tools configured . If you don't have a Jenkins system, create one now in Azure from the [Jenkins solution template](/azure/jenkins/install-jenkins-solution-template).
+* [Jenkins](https://jenkins.io/) with JDK and Maven tools configured. If you don't have a Jenkins system, create one now in Azure from the [Jenkins solution template](/azure/jenkins/install-jenkins-solution-template).
 * A [GitHub](https://github.com) account.
 * [Azure CLI 2.0](/cli/azure), either from your local command line or in the [Azure Cloud Shell](/azure/cloud-shell/overview)
 
@@ -97,7 +97,7 @@ Set up Jenkins to receive [GitHub webhooks](https://developer.github.com/webhook
 ## Configure the Azure App Service Jenkins plug-in
 
 1. In the Jenkins web console, select the **MyJavaApp** job you created and then select **Configure** on the left hand of the page.
-2. Scroll down to **Post-build Actions**, then select **Add post-build action** and choose **Publish an Azure Web App**.
+2. Scroll down to **Post-build Actions**, select **Add post-build action**, and choose **Publish an Azure Web App**.
 3. Under **Azure Profile Configuration**, select **Add** next to **Azure Credentials** and choose **Jenkins**.
 4. In the **Add Credentials** dialog, select **Microsoft Azure Service Principal** from the **Kind** drop-down.
 5. Create an Active Directory Service principal from the Azure CLI or [Cloud Shell](/azure/cloud-shell/overview).
@@ -159,7 +159,7 @@ Set up Jenkins to receive [GitHub webhooks](https://developer.github.com/webhook
 ## Deploy the app from GitHub
 
 1. From the Jenkins project, select **Build Now** to deploy the sample app to Azure.
-2. Once the build completes, your app is live on Azure at it's publishing URL , for example http://myjavaapp.azurewebsites.net.   
+2. Once the build completes, your app is live on Azure at its publishing URL, for example http://myjavaapp.azurewebsites.net.   
    ![View your deployed app on Azure](media/jenkins-java-quickstart/hello_docker_world_unedited.png)
 
 ## Push changes and redeploy
diff --git a/articles/jenkins/jenkins-aks-blue-green-deployment.md b/articles/jenkins/jenkins-aks-blue-green-deployment.md
@@ -1,20 +1,13 @@
 ---
 title: Deploy to Azure Kubernetes Service (AKS) by using Jenkins and the blue/green deployment pattern
 description: Learn how to deploy to Azure Kubernetes Service (AKS) by using Jenkins and the blue/green deployment pattern.
-services: app-service\web
-documentationcenter: ''
+ms.service: jenkins
+keywords: jenkins, azure, devops, kubernetes, k8s, aks, blue green deployment, continuous delivery, cd
 author: tomarcher
-manager: jpconnock
-editor: ''
-ms.assetid: 
-ms.service: multiple
-ms.devlang: na
-ms.topic: article
-ms.tgt_pltfrm: na
-ms.workload: web
-ms.date: 07/23/2018
+manager: jeconnoc
 ms.author: tarcher
-ms.custom: jenkins
+ms.topic: tutorial
+ms.date: 07/23/2018
 ---
 
 # Deploy to Azure Kubernetes Service (AKS) by using Jenkins and the blue/green deployment pattern
diff --git a/articles/jenkins/jenkins-azure-vm-agents.md b/articles/jenkins/jenkins-azure-vm-agents.md
@@ -1,12 +1,12 @@
 ---
 title: Scale Jenkins deployments with Azure VM agents. 
 description: Add additional capacity to your Jenkins pipelines using Azure virtual machines with the Jenkins Azure VM Agent plug-in.
-ms.topic: tutorial
-ms.author: tarcher
+ms.service: jenkins
+keywords: jenkins, azure, devops, virtual machine, agents
 author: tomarcher
-manager: jpconnock
-ms.service: devops
-ms.custom: jenkins
+manager: jeconnoc
+ms.author: tarcher
+ms.topic: tutorial
 ms.date: 07/31/2018
 ---
 
@@ -113,7 +113,7 @@ In the **Image Configuration** section of the plugin configuration, select **Ubu
 
 ![Configure VM OS and tools](./media/jenkins-azure-vm-agents/jenkins-os-config.png)
 
-Select **Add** next to **Admin Credentials**, then select **Jenkins**. Enter a username and password used to log in to the agents, making sure they satisfy the [username and password policy](/azure/virtual-machines/linux/faq#what-are-the-username-requirements-when-creating-a-vm) for administrative accounts on Azure VMs.
+Select **Add** next to **Admin Credentials**, then select **Jenkins**. Enter a username and password used to sign in to the agents, making sure they satisfy the [username and password policy](/azure/virtual-machines/linux/faq#what-are-the-username-requirements-when-creating-a-vm) for administrative accounts on Azure VMs.
 
 Select **Verify Template** to verify the configuration and then select **Save** to save your changes and return to the Jenkins dashboard.
 
diff --git a/articles/jenkins/overview.md b/articles/jenkins/overview.md
@@ -1,20 +1,20 @@
 ---
-title: Overview of Jenkins and Azure | Microsoft Docs
+title: Overview of Jenkins and Azure
 description: Host the Jenkins build and deploy automation server in Azure and use Azure compute and storage resources to extend your continous integration and deployment (CI/CD) pipelines.
-ms.topic: overview
-ms.author: tarcher
+ms.service: jenkins
+keywords: jenkins, azure, devops, overview
 author: tomarcher
-manager: jpconnock
-ms.service: devops
-ms.custom: jenkins
+manager: jeconnoc
+ms.author: tarcher
+ms.topic: overview
 ms.date: 07/25/2018
 ---
 
 # Azure and Jenkins
 
 [Jenkins](https://jenkins.io/) is a popular open-source automation server used to set up continuous integration and delivery (CI/CD) for your software projects. You can host your Jenkins deployment in Azure or extend your existing Jenkins configuration using Azure resources. Jenkins plugins are also available to simplify CI/CD of your applications to Azure.
 
-This article is an introduction to using Azure with Jenkins, detailing the core Azure features available to Jenkins users. To get started with your own Jenkins server in Azure, see our [quickstart](install-jenkins-solution-template.md).
+This article is an introduction to using Azure with Jenkins, detailing the core Azure features available to Jenkins users. For more information about getting started with your own Jenkins server in Azure, see [Create a Jenkins server on Azure](install-jenkins-solution-template.md).
 
 ## Host your Jenkins servers in Azure
 
