Check out our end-to-end Java DevOps demo video on YouTube!

ON THIS PAGE we will show you how to complete your code changes and ensure that the DeepSpace Azure Web App is updated.

ASSUMPTIONS

  • You have read the Implement Changes Page and created a topic branch, made the code changes, and created a pull request.

Verify Merge

Following the instructions below, you will complete your pull request, clean up your topic branch, verify the build and ensure the corresponding tests are successful and then see the updated Azure Web App. We will lead you through the steps to: 1) Merge (and then delete) your topic branch, 2) Verify the continuous integration (CI) build of the master branch, 3) Check the test results from the CI build, 4) View the updates to the Azure Web App, and 5) Close the completed user story on the task board.

Merge and Delete your Topic Branch

Since a pull request requires approval from code reviewers, go ahead and approve this pull request yourself. To do that, under the Reviewers section on the right, click the drop down under your user name and choose "Approved". Once you do so, the "Reviewers approved" section will change to a green checkmark and you can successfully complete the pull request. (Typically, another person on your team will review and approve your code.)

Now click the Complete Pull Request button. A few moments after clicking the button, the change will be merged into the master branch. You will see an indication of this by the commit link which appears next to the "Merged successfully" text. In this case, our link shows "Commit 51a8bb".

Since your code change has already been merged to the master branch, you can now delete your topic branch as it is no longer needed. To do this, click the Delete source branch button. After a moment, the branch will be deleted from the server and you will see the "The source branch has been deleted." status message on the pull request.

Verify the CI Build of master

Now that you've pushed your changes to the master branch, you should ensure that your changes have built successfully. Click the Build menu option in the top left of the Team Services web page and then click the "First Build Definition" link in the build definition list on the left. After the page refreshes, the Completed tab will be selected and you will see the completed builds for that build definition. In this case, a Batched continuous integration build was successfully completed for the commit you pushed to master in the previous step.

Double-click on the first build entry in the list and you will see the build summary as in the image below.

Check Test Results

With the build summary page open, click on the link under the Test results section in the right window pane to see the summary results of automated tests. This should update your window to be in the Test context and show a screen similar to the image below.

View the Updated App

Part of the CI build is to continually push the changes to the previously deployed Azure Web App. To see your change applied to the Azure Web App, navigate back to the web site you initially deployed to at http://<name_you_selected>.azurewebsites.net. If the DeepSpace web site is already open in a browser window, simply refresh that window.

Close the User Story

Finally, now that the user story is complete, we need to mark it as Closed on the task board. To do that, first click on the Work menu option in the top left of the Team Services webpage to get back to the task board. To close the story, simply drag it from the Active column to the Closed column.

Want More Practice?

For even more practice, you can go back and fix the bug to add Earth to the set of planets in the Azure Web App. To do so, you will need to update the application code as well as the test code. In the application code, update src/main/java/com/microsoft/tfs/demo/ImageService.java, by removing lines 59 and 65. In the test code, update test/java/com/microsoft/tfs/demo/ImageServiceTest.java by commenting out line 55, uncommenting line 56, and enabling the test at line 84. After completing a pull request, also be sure that you resolve the bug on the task board.

Next Steps

Now that you've completed this walkthrough, learn about the Tools currently available for Eclipse and IntelliJ, as well as the Git Credential Helper.