From 4acca227f4ddae62696e0ee1f36c2c2162ab595a Mon Sep 17 00:00:00 2001 From: donal <donalspring@gmail.com> Date: Mon, 23 Apr 2018 16:22:29 +0200 Subject: [PATCH] FIX - url and scl stuff --- exercises/2-attack-of-the-pipelines/README.md | 15 +++++++-------- exercises/3-revenge-of-the-automated-testing/README.md | 8 ++++---- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/exercises/2-attack-of-the-pipelines/README.md b/exercises/2-attack-of-the-pipelines/README.md index 5bb73bc..5e948f6 100644 --- a/exercises/2-attack-of-the-pipelines/README.md +++ b/exercises/2-attack-of-the-pipelines/README.md @@ -66,7 +66,7 @@ 2. Git clone the `todolist-fe` project to somewhere sensible and checkout the `develop` branch. ```bash -$ git clone https://github.com/springdo/todolist-fe.git +$ git clone https://github.com/rht-labs/todolist-fe.git $ cd todolist-fe $ git checkout develop ``` @@ -174,7 +174,7 @@ 2. Now let's move on to the `todolist-api` and wire them together. As with the `todolist-fe` we need to clone the repo and add it to our GitLab in the cluster. ```bash -$ git clone https://github.com/springdo/todolist-api.git +$ git clone https://github.com/rht-labs/todolist-api.git $ git cd todolist-api $ git checkout develop ``` @@ -457,12 +457,11 @@ 5. Move on to the Build section and select `Add build step`. From the dropdown select `Execute Shell`. On the box that appears; insert the following, to build package and deploy our app to Nexus: ```bash -#!/bin/bash set -o xtrace -scl enable rh-nodejs8 'npm install' -scl enable rh-nodejs8 'npm run build:ci:dev' -scl enable rh-nodejs8 'npm run package' -scl enable rh-nodejs8 'npm run publish' +npm install +npm run build:ci:dev +npm run package +npm run publish ```  @@ -602,7 +601,7 @@ 6. On the Build tab; remove the `:dev` from the `npm run build:ci:dev` so the line reads. The rest of the instructions can be left as they are. ```bash -scl enable rh-nodejs8 'npm run build:ci' +npm run build:ci ``` 6. Save the configuration for `dev-todolist-api-build` diff --git a/exercises/3-revenge-of-the-automated-testing/README.md b/exercises/3-revenge-of-the-automated-testing/README.md index a219089..faf69fd 100644 --- a/exercises/3-revenge-of-the-automated-testing/README.md +++ b/exercises/3-revenge-of-the-automated-testing/README.md @@ -119,7 +119,7 @@ Click on `dev-todolist-fe-build` and then click the `configure` button on the left-hand side.  -2. Scroll to the `Build` part of the configuration page and add `scl enable rh-nodejs8 'npm run test'` below `scl enable rh-nodejs8 'npm install'`. Click `save` or `apply` at the bottom to save the changes. +2. Scroll to the `Build` part of the configuration page and add `npm run test` below `npm install`. Click `save` or `apply` at the bottom to save the changes.  2. Scroll to the `Post-build Actions` section and click `Add post-build action`. Select `Publish xUnit test result report`. @@ -147,7 +147,7 @@ 2. We're now going to do the same for the api. Head to the `configure` panel of the `dev-todolist-api-build` job. -2. Add `scl enable rh-nodejs8 'npm run test:ci'` above `npm run build:ci`. +2. Add `npm run test:ci` above `npm run build:ci`.  2. Scroll to the `Post-build Actions` section and click `Add post-build action`. Select `Publish xUnit test result report`. @@ -200,8 +200,8 @@ 2. On the Build section; add a build step to execute shell and fill in the followin substituting the domain name and `YOUR_NAME` accordingly: ```bash export E2E_TEST_ROUTE="http://todolist-fe-<YOUR_NAME>-dev.apps.somedomain.com/" -scl enable rh-nodejs8 'npm install' -scl enable rh-nodejs8 'npm run e2e:ci' +npm install +npm run e2e:ci ```  -- Gitblit v1.9.3