Merge branch 'Telefonica:master' into enterprise_support

Author: ldaneliukas

.fixtures.yml

@@ -10,6 +10,6 @@ fixtures:
       ref: "v1.1.2"
     systemd:
       repo: "https://github.com/camptocamp/puppet-systemd.git"
-      ref: "1.1.1"
+      ref: "2.7.0"
 
 

manifests/instance.pp

@@ -150,8 +150,20 @@
     refreshonly => true
   }
 
+  $active_service = $ensure ? {
+    'present' => true,
+    'absent'  => false,
+  }
+
+  $enable_service = $ensure ? {
+    'present' => true,
+    'absent'  => false,
+  }
+
   systemd::unit_file { "github-actions-runner.${instance_name}.service":
     ensure  => $ensure,
+    enable  => $enable_service,
+    active  => $active_service,
     content => epp('github_actions_runner/github-actions-runner.service.epp', {
       instance_name => $instance_name,
       root_dir      => $github_actions_runner::root_dir,
@@ -163,23 +175,6 @@
     }),
     require => [File["${github_actions_runner::root_dir}/${instance_name}/configure_install_runner.sh"],
                 Exec["${instance_name}-run_configure_install_runner.sh"]],
-    notify  => Service["github-actions-runner.${instance_name}.service"],
-  }
-
-  $ensure_service = $ensure ? {
-    'present' => running,
-    'absent'  => stopped,
-  }
-
-  $enable_service = $ensure ? {
-    'present' => true,
-    'absent'  => false,
-  }
-
-  service { "github-actions-runner.${instance_name}.service":
-    ensure  => $ensure_service,
-    enable  => $enable_service,
-    require => Class['systemd::systemctl::daemon_reload'],
   }
 
 }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "telefonica-github_actions_runner",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "author": "Shimon Ohayon",
   "summary": "Module to configure our GitHub Actions runner on Debian hosts",
   "license": "Apache-2.0",
@@ -14,7 +14,7 @@
     },
     {
       "name": "camptocamp/systemd",
-      "version_requirement": ">= 1.1.1 < 3.0.0"
+      "version_requirement": ">= 2.7.0 < 3.0.0"
     },
     {
       "name": "puppet-archive",

spec/classes/github_actions_runner_spec.rb

@@ -87,12 +87,6 @@
         end
       end
 
-      context 'is expected to create a github_actions_runner service' do
-        it do
-          is_expected.to contain_service('github-actions-runner.first_runner.service').with('ensure' => 'running', 'enable' => true)
-        end
-      end
-
       context 'is expected to contain archive' do
         it do
           is_expected.to contain_archive('first_runner-actions-runner-linux-x64-2.272.0.tar.gz').with(
@@ -208,6 +202,64 @@
         end
       end
 
+      context 'is expected to create a github_actions_runner with service active and enabled' do
+        let(:params) do
+          super().merge(
+            'http_proxy' => 'http://proxy.local',
+            'https_proxy' => 'http://proxy.local',
+            'no_proxy' => 'example.com',
+            'instances' => {
+              'first_runner' => {
+                'labels' => ['test_label1'],
+                'repo_name' => 'test_repo',
+              },
+            },
+          )
+        end
+
+        it do
+          is_expected.to contain_systemd__unit_file('github-actions-runner.first_runner.service').with(
+            'ensure' => 'present',
+            'enable' => true,
+            'active' => true,
+          )
+        end
+      end
+
+      context 'is expected to remove github_actions_runner unit_file and other resources' do
+        let(:params) do
+          super().merge(
+            'http_proxy' => 'http://proxy.local',
+            'https_proxy' => 'http://proxy.local',
+            'no_proxy' => 'example.com',
+            'instances' => {
+              'first_runner' => {
+                'ensure' => 'absent',
+                'labels' => ['test_label1'],
+                'repo_name' => 'test_repo',
+              },
+            },
+          )
+        end
+
+        it do
+          is_expected.to contain_systemd__unit_file('github-actions-runner.first_runner.service').with(
+            'ensure' => 'absent',
+            'enable' => false,
+            'active' => false,
+          )
+          is_expected.to contain_file('/some_dir/actions-runner-2.272.0/first_runner').with(
+            'ensure' => 'absent',
+          )
+          is_expected.to contain_archive('first_runner-actions-runner-linux-x64-2.272.0.tar.gz').with(
+            'ensure' => 'absent',
+          )
+          is_expected.to contain_file('/some_dir/actions-runner-2.272.0/first_runner/configure_install_runner.sh').with(
+            'ensure' => 'absent',
+          )
+        end
+      end
+
       context 'is expected to create a github_actions_runner installation with proxy settings in systemd globally in init.pp' do
         let(:params) do
           super().merge(