Merge pull request #88 from carljohnstone/trusty-to-focal

Switch from Ubuntu Trusty to Ubuntu Focal
voxpupuli · Aug 11, 2020 · 0b9e2d5 · 0b9e2d5
2 parents 7917fa6 + 8b5b68d
commit 0b9e2d5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ gitlab_ci_runner::runner_defaults:
   url: "https://git.example.com/ci"
   registration-token: "1234567890abcdef"
   executor: "docker"
-  docker-image: "ubuntu:trusty"
+  docker-image: "ubuntu:focal"
   builds_dir: "/tmp"
   cache_dir: "/tmp"
 ```

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -68,9 +68,9 @@
     ensure_packages($xz_package_name)
 
     $docker_images = {
-      ubuntu_trusty => {
+      ubuntu_focal => {
         image     => 'ubuntu',
-        image_tag => 'trusty',
+        image_tag => 'focal',
       },
     }
 

diff --git a/spec/classes/gitlab_ci_runner_spec.rb b/spec/classes/gitlab_ci_runner_spec.rb
@@ -184,9 +184,9 @@
             is_expected.to contain_class('docker::images').
               with(
                 images: {
-                  'ubuntu_trusty' => {
+                  'ubuntu_focal' => {
                     'image'     => 'ubuntu',
-                    'image_tag' => 'trusty'
+                    'image_tag' => 'focal'
                   }
                 }
               )