Commit 7586c86f authored by Dan Plumbley's avatar Dan Plumbley
Browse files

Resolve "Update to ILT Advanced CI/CD Labs - Small General Fixes"

parent d087eb14
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -164,6 +164,9 @@ When multiple users work on a project at the same time, merge conflicts are ofte
      workflow:
        auto_cancel:
          on_job_failure: all
        rules:
          - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
          - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

      default:
        image: node:latest
+8 −8
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ For this task, we will be creating a web application to run in our review enviro

1. Select **Edit > Edit in pipeline editor**.

1. When we add express code into our `index.js` file, our tests will no longer be able to run against `index.js`, since running this will create a webserver that waits for connections. Thus, let's remove the `test binarysearch` and the `test linearsearch` jobs from the file. Remove the jobs from the `.gitlab-ci.yml` file, and select **Commit changes**.
1. When we add express code into our `index.js` file, our tests will no longer be able to run against `index.js`, since running this will create a webserver that waits for connections. Thus, let's remove the `install deps`, `test binarysearch` and the `test linearsearch` jobs from the file. Remove the jobs from the `.gitlab-ci.yml` file, and select **Commit changes**.

1. Navigate back to your project repository.

@@ -177,9 +177,11 @@ To test that your review app works, let's create a new merge request.

1. Set the branch name to `test_review` and select **Create branch**.

1. Select `index.js`.
1. Create a merge request for this branch.

1. Select **Edit > Edit single file**.
1. Once you have created this, open the Web IDE from the merge request by selecting **Code > Open in Web IDE**

1. Select your `index.js` file.

1. Update your `res.send` to display any message you like. Below is an example:

@@ -197,14 +199,12 @@ To test that your review app works, let's create a new merge request.
      })
      ```

1. Select **Commit changes**, add an appropriate commit message and select **Commit changes**.

1. Select **Create merge request**.

1. Leave all options as default and select **Create merge request**.
1. Select the **source control** icon. Enter a commit message, then click the **Commit and put to...** button to commit your code change.

1. Wait for the pipeline to complete.

1. Open your merge request.

1. Select **View app** after the pipeline completes.

## Lab Guide Complete
+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ Follow these steps to set up and use a feature flag:

1. To test running this, we will test running the script.

1. Open you `.gitlab-ci.yml` file.
1. Open your `.gitlab-ci.yml` file.

1. Select **Edit > Edit in pipeline editor**.

+2 −2

File changed.

Contains only whitespace changes.