Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🦜 OCP 4.11 🦜 #232

Merged
merged 11 commits into from
Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions docs/1-the-manual-menace/1-the-basics.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,17 @@
![crw](./images/crw.png)

<p class="warn">
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:</br>
<span style="color:blue;"><a id=crw_dev_filelocation href=""></a><span>
If the workspace has not been set up for you, you can create one from this devfile.
</br>
On CodeReady Workspaces, "Create Workspace > Custom Workspace".
</br>
For OpenShift 4.9, 4.10 - 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
2 changes: 1 addition & 1 deletion docs/1-the-manual-menace/2-argocd.md
Original file line number Diff line number Diff line change
Expand Up @@ -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: `<TEAM_NAME>-ci-cd`
Expand Down
6 changes: 6 additions & 0 deletions docs/3-revenge-of-the-automated-testing/1a-jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`.

<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
3 changes: 2 additions & 1 deletion docs/3-revenge-of-the-automated-testing/4a-jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@

5. Push our changes to the repo to trigger a new build

```
```bash
cd /projects/pet-battle
git add .
git commit -m "💅 ADD - linting to the pipeline 💅"
git push
Expand Down
6 changes: 6 additions & 0 deletions docs/3-revenge-of-the-automated-testing/4b-tekton.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
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
2 changes: 1 addition & 1 deletion docs/3-revenge-of-the-automated-testing/5a-jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Remember in our pipeline, there is a stage called `"🏗️ Deploy - Helm Packag
You should see such output 💪💪
<div class="highlight" style="background: #f7f7f7">
<pre><code class="language-yaml">
KubeLinter 0.2.2
KubeLinter 0.2.6
No lint errors found!
</code></pre></div>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion docs/config/all.json
Original file line number Diff line number Diff line change
@@ -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"
}
2 changes: 2 additions & 0 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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);
})
Expand Down