diff --git a/docs/1-the-manual-menace/1-the-basics.md b/docs/1-the-manual-menace/1-the-basics.md index 9f9e059c..1c62ae22 100644 --- a/docs/1-the-manual-menace/1-the-basics.md +++ b/docs/1-the-manual-menace/1-the-basics.md @@ -6,8 +6,17 @@ ![crw](./images/crw.png)

- If the workspace has not been set up for you, you can create one from this devfile. On CodeReady Workspaces, "Create Workspace > Custom Workspace". Enter this URL to load the TL500 stack:
- + If the workspace has not been set up for you, you can create one from this devfile. +
+ On CodeReady Workspaces, "Create Workspace > Custom Workspace". +
+ For OpenShift 4.9, 4.10 - Enter this URL to load the TL500 stack:
+ +
+ On DevSpaces Workspaces, "Add Workspace > Import from Git". +
+ For OpenShift 4.11+ - Enter this URL to load the TL500 stack:
+

2. In your IDE (it may take some time to open ... ⏰☕️), open a new terminal by hitting `Terminal > Open Terminal in Specific Container > stack-tl500` from the menu. diff --git a/docs/1-the-manual-menace/2-argocd.md b/docs/1-the-manual-menace/2-argocd.md index d7cf4c36..1bda3107 100644 --- a/docs/1-the-manual-menace/2-argocd.md +++ b/docs/1-the-manual-menace/2-argocd.md @@ -135,7 +135,7 @@ EOF * Repository URL: `https://rht-labs.com/todolist/` * Select `Helm` from the right drop down menu * Chart: `todolist` - * Version: `1.0.1` + * Version: `1.1.0` * On the "DESTINATION" box * Cluster URL: `https://kubernetes.default.svc` * Namespace: `-ci-cd` diff --git a/docs/3-revenge-of-the-automated-testing/1a-jenkins.md b/docs/3-revenge-of-the-automated-testing/1a-jenkins.md index 47bc1091..9dfc08fc 100644 --- a/docs/3-revenge-of-the-automated-testing/1a-jenkins.md +++ b/docs/3-revenge-of-the-automated-testing/1a-jenkins.md @@ -34,6 +34,12 @@ 2. Then we need to introduce SonarQube credentials to `Jenkinsfile` - these are already being synchronized to the cluster from Git, we just have to tell our pipeline to use them. Add the followings to the list of other `CREDS` in the `environment {}` block in the `Jenkinsfile`. +

+ ⛷️ NOTE ⛷️ - If you are using DevSpaces in OpenShift 4.11+ you may need to add the `pet-battle` folder to you Che Workspace to open the `Jenkinsfile` +

+ + ![add-folder-to-workspace](images/add-folder-to-workspace.png) + ```groovy SONARQUBE_CREDS = credentials("${OPENSHIFT_BUILD_NAMESPACE}-sonarqube-auth") ``` diff --git a/docs/3-revenge-of-the-automated-testing/4a-jenkins.md b/docs/3-revenge-of-the-automated-testing/4a-jenkins.md index a0abe908..530a5c63 100644 --- a/docs/3-revenge-of-the-automated-testing/4a-jenkins.md +++ b/docs/3-revenge-of-the-automated-testing/4a-jenkins.md @@ -33,6 +33,7 @@ 5. Push our changes to the repo to trigger a new build + ``` cd /projects/pet-battle git add . diff --git a/docs/3-revenge-of-the-automated-testing/4b-tekton.md b/docs/3-revenge-of-the-automated-testing/4b-tekton.md index 190616df..3fec0b7e 100644 --- a/docs/3-revenge-of-the-automated-testing/4b-tekton.md +++ b/docs/3-revenge-of-the-automated-testing/4b-tekton.md @@ -7,6 +7,12 @@ mvn formatter:format ``` +

+ ⛷️ NOTE ⛷️ - If you are using DevSpaces in OpenShift 4.11+ you may need to add the `pet-battle-api` folder to you Che Workspace to open a file in the next step. +

+ + ![add-folder-to-workspace](images/add-folder-to-workspace.png) + 2. Now edit a java class file, such as `/projects/pet-battle-api/src/test/java/app/battle/CatEndpointTest.java` and add some TAB/spaces e.g. in L19,21 ![images/formatting-code-pb-api.png](images/formatting-code-pb-api-tab.png) diff --git a/docs/3-revenge-of-the-automated-testing/5a-jenkins.md b/docs/3-revenge-of-the-automated-testing/5a-jenkins.md index 6b439d1b..4896e65b 100644 --- a/docs/3-revenge-of-the-automated-testing/5a-jenkins.md +++ b/docs/3-revenge-of-the-automated-testing/5a-jenkins.md @@ -97,7 +97,7 @@ Remember in our pipeline, there is a stage called `"🏗️ Deploy - Helm Packag You should see such output 💪💪 

-    KubeLinter 0.2.2
+    KubeLinter 0.2.6
 
     No lint errors found!
diff --git a/docs/3-revenge-of-the-automated-testing/images/add-folder-to-workspace.png b/docs/3-revenge-of-the-automated-testing/images/add-folder-to-workspace.png new file mode 100644 index 00000000..e6b93825 Binary files /dev/null and b/docs/3-revenge-of-the-automated-testing/images/add-folder-to-workspace.png differ diff --git a/docs/config/all.json b/docs/config/all.json index c564c0cf..6ced1fde 100644 --- a/docs/config/all.json +++ b/docs/config/all.json @@ -1,3 +1,4 @@ { - "devfile": "https://raw.githubusercontent.com/rht-labs/enablement-framework/main/codereadyworkspaces/tl500-devfile.yaml" + "devfile": "https://raw.githubusercontent.com/rht-labs/enablement-framework/main/codereadyworkspaces/tl500-devfile.yaml", + "devfile411": "https://raw.githubusercontent.com/rht-labs/enablement-framework/ocp-4.11/codereadyworkspaces/tl500-devfile-v2.yaml" } \ No newline at end of file diff --git a/docs/index.html b/docs/index.html index d2aeb7d6..c6d88c2e 100644 --- a/docs/index.html +++ b/docs/index.html @@ -111,6 +111,8 @@ console.info("🥳 YAY! Found the config file 🥳", jsonData); document.getElementById('crw_dev_filelocation').setAttribute('href', jsonData.devfile); document.getElementById('crw_dev_filelocation').innerHTML = jsonData.devfile; + document.getElementById('crw_dev_filelocation_4.11').setAttribute('href', jsonData.devfile411); + document.getElementById('crw_dev_filelocation_4.11').innerHTML = jsonData.devfile411; }).catch(function(err) { console.warn("😭 Opps, Cannot find the config file 😭", err); })