Skip to content

Commit

Permalink
Merge pull request #240 from jfilipcz/main-gls
Browse files Browse the repository at this point in the history
Revert of OCP 4.11 content on a temporary branch
  • Loading branch information
eformat authored Dec 7, 2022
2 parents 0dc399a + 0ac7af9 commit 8e90e55
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 19 deletions.
4 changes: 1 addition & 3 deletions docs/1-the-manual-menace/1-the-basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@
</br>
On CodeReady Workspaces, "Create Workspace > Custom Workspace".
</br>
For OpenShift 4.9, 4.10 - Enter this URL to load the TL500 stack:</br>
Enter this URL to load the TL500 stack:</br>
<span style="color:blue;"><a id=crw_dev_filelocation href=""></a></span>
</br>
On DevSpaces Workspaces, "Add Workspace > Import from Git".
</br>
For OpenShift 4.11+ - Enter this URL to load the TL500 stack:</br>
<span style="color:blue;"><a id=crw_dev_filelocation_4.11 href=""></a></span>
</p>

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.
Expand Down
5 changes: 0 additions & 5 deletions docs/3-revenge-of-the-automated-testing/1a-jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@

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`.

<p class="warn">
⛷️ <b>NOTE</b> ⛷️ - 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`
</p>

![add-folder-to-workspace](images/add-folder-to-workspace.png)

```groovy
SONARQUBE_CREDS = credentials("${OPENSHIFT_BUILD_NAMESPACE}-sonarqube-auth")
Expand Down
6 changes: 0 additions & 6 deletions docs/3-revenge-of-the-automated-testing/4b-tekton.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
mvn formatter:format
```

<p class="warn">
⛷️ <b>NOTE</b> ⛷️ - 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.
</p>

![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)
Expand Down
5 changes: 2 additions & 3 deletions docs/config/all.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
{
"devfile": "https://raw.githubusercontent.com/rht-labs/enablement-framework/main/codereadyworkspaces/tl500-devfile.yaml",
"devfile411": "https://raw.githubusercontent.com/rht-labs/enablement-framework/main/codereadyworkspaces/tl500-devfile-v2.yaml"
}
"devfile": "https://raw.githubusercontent.com/rht-labs/enablement-framework/main/codereadyworkspaces/tl500-devfile.yaml"
}
2 changes: 0 additions & 2 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,6 @@
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);
})
Expand Down

0 comments on commit 8e90e55

Please sign in to comment.