Lunch updates

nicholasdille · Dec 7, 2023 · 05ecb4f · 05ecb4f
1 parent 81127ce
commit 05ecb4f
Show file tree

Hide file tree

Showing 10 changed files with 107 additions and 57 deletions.
diff --git a/hands-on/2023-11-30/120_templates/exercise/index.html b/hands-on/2023-11-30/120_templates/exercise/index.html
@@ -1611,7 +1611,7 @@ <h2 id="task-3-loading-templates-from-another-project">Task 3: Loading templates
 <span class="normal"><a href="#__codelineno-7-66">66</a></span>
 <span class="normal"><a href="#__codelineno-7-67">67</a></span>
 <span class="normal"><a href="#__codelineno-7-68">68</a></span></pre></div></td><td class="code"><div><pre><span></span><code><span id="__span-7-1"><a id="__codelineno-7-1" name="__codelineno-7-1"></a><span class="hll"><span class="nt">include</span><span class="p">:</span>
-</span></span><span id="__span-7-2"><a id="__codelineno-7-2" name="__codelineno-7-2"></a><span class="hll"><span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">project</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">seat/template-go</span>
+</span></span><span id="__span-7-2"><a id="__codelineno-7-2" name="__codelineno-7-2"></a><span class="hll"><span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">project</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">seat1/template-go</span>
 </span></span><span id="__span-7-3"><a id="__codelineno-7-3" name="__codelineno-7-3"></a><span class="hll"><span class="w">  </span><span class="nt">ref</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">main</span>
 </span></span><span id="__span-7-4"><a id="__codelineno-7-4" name="__codelineno-7-4"></a><span class="hll"><span class="w">  </span><span class="nt">file</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">go.yaml</span>
 </span></span><span id="__span-7-5"><a id="__codelineno-7-5" name="__codelineno-7-5"></a>

diff --git a/hands-on/2023-11-30/140_merge_requests/exercise/index.html b/hands-on/2023-11-30/140_merge_requests/exercise/index.html
diff --git a/hands-on/2023-11-30/search/search_index.json b/hands-on/2023-11-30/search/search_index.json
diff --git a/hands-on/2023-11-30/sitemap.xml.gz b/hands-on/2023-11-30/sitemap.xml.gz
diff --git a/slides/2023-11-30/160_gitlab_ci/010_jobs_and_stages/slides.md b/slides/2023-11-30/160_gitlab_ci/010_jobs_and_stages/slides.md
@@ -52,6 +52,8 @@ job_name:
     whoami
 ```
 
+Use this for commands with URLs or the colon will break parsing
+
 Shell here documents:
 
 ```yaml

diff --git a/slides/2023-11-30/160_gitlab_ci/110_triggers/slides.md b/slides/2023-11-30/160_gitlab_ci/110_triggers/slides.md
@@ -110,6 +110,8 @@ job_name2:
       file: <relative-path-to-file>
 ```
 
+File must match `/\.ya?ml$/`
+
 ---
 
 ## Hands-On
@@ -153,7 +155,7 @@ Wait for successul downstream pipeline using `strategy` [](https://docs.gitlab.c
 ```yaml
 job_name:
   trigger:
-    include: child.ymal
+    include: child.yaml
     strategy: depend
 ```
 

diff --git a/slides/2023-11-30/160_gitlab_ci/130_rules/slides.md b/slides/2023-11-30/160_gitlab_ci/130_rules/slides.md
@@ -104,24 +104,3 @@ Template to disable job:
 ## Hands-On
 
 See chapter [Rules](/hands-on/2023-11-30/130_rules/exercise/)
-
----
-
-## Pro tip: Rule templates
-
-Pipelines often have many jobs
-
-Rules will be repeated multiple times
-
-Combine rules with templates to prevent repetition
-
-```yaml
-.rule-only-web:
-  rules:
-  - if: $CI_PIPELINE_SOURCE == 'web'
-
-job_name:
-  extends:
-  - .rule-only-web
-  #...
-```
diff --git a/slides/2023-11-30/160_gitlab_ci/140_merge_requests/slides.md b/slides/2023-11-30/160_gitlab_ci/140_merge_requests/slides.md
@@ -35,6 +35,45 @@ Do not have access to protected variables
 
 ---
 
+## Rule templates
+
+Pipelines often have many jobs
+
+Rules will be repeated multiple times
+
+Combine rules with templates to prevent repetition
+
+```yaml
+.rule-only-web:
+  rules:
+  - if: $CI_PIPELINE_SOURCE == 'web'
+
+job_name:
+  extends:
+  - .rule-only-web
+  #...
+```
+
+---
+
 ## Hands-On
 
 See chapter [Merge requests](/hands-on/2023-11-30/140_merge_requests/exercise/)
+
+---
+
+## Integration with SonarQube
+
+### Merge request decoration
+
+Write scan results into merge request [](https://docs.sonarsource.com/sonarqube/latest/devops-platform-integration/gitlab-integration/)
+
+Requires Developer Edition
+
+### Quality Gates
+
+Wait for quality gates:
+
+```bash
+sonar-scanner -Dsonar.qualitygate.wait=true
+```
diff --git a/slides/2023-11-30/160_gitlab_ci/260_runners/slides.md b/slides/2023-11-30/160_gitlab_ci/260_runners/slides.md
@@ -63,3 +63,27 @@ Shared across a group or a project
 Accessible to members with **Owner** role
 
 Shared runners can be disabled
+
+---
+
+## Runner tags
+
+Runners can have tags
+
+Tags specify features based on...
+
+- Networking locations
+- Hardware
+- Runner configuration
+
+### Selecting runners in pipelines
+
+Each can use a different runner:
+
+```yaml
+job_name:
+  tags:
+  - foo
+```
+
+All features work across different runners
diff --git a/slides/2023-11-30/index.html b/slides/2023-11-30/index.html
@@ -74,7 +74,7 @@
 
 ### Advanced
 
-[Environments](#/gitlab_environments) - [Trigger](#/gitlab_triggers) - [Child pipelines](#/gitlab_child_pipelines) - [Templates](#/gitlab_templates) - [Rules](#/gitlab_rules) - [Merge requests](#/gitlab_merge_requests) - [Matrix Jobs](#/gitlab_matrix_jobs)
+[Environments](#/gitlab_environments) - [Trigger](#/gitlab_triggers) - [Child pipelines](#/gitlab_triggers) - [Templates](#/gitlab_templates) - [Rules](#/gitlab_rules) - [Merge requests](#/gitlab_merge_requests) - [Matrix Jobs](#/gitlab_matrix_jobs)
 
 ### Expert
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,8 @@ job_name: @@
         whoami
     ```
+    Use this for commands with URLs or the colon will break parsing
     Shell here documents:
     ```yaml
@@ Expand Down @@