move test execution into the beaker role

theforeman · Nov 30, 2023 · b474f22 · b474f22
1 parent 51c235f
commit b474f22
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/pipelines/candlepin/03-tests.yml b/pipelines/candlepin/03-tests.yml
@@ -7,14 +7,11 @@
     - ../vars/forklift_candlepin.yml
   tasks:
     - name: Run acceptance tests
-      command: bundle exec rake beaker
-      args:
-        chdir: /src/puppet-candlepin
-      environment:
-        BEAKER_HYPERVISOR: "docker"
-        BEAKER_provision: "yes"
-        BEAKER_setfile: "{{ beaker_os }}-64{hostname={{ beaker_os }}-64.example.com}"
-        BEAKER_destroy: "no"
-        BEAKER_FACTER_CANDLEPIN_VERSION: "{{ pipeline_version }}"
+      ansible.builtin.include_role:
+        name: beaker
+        tasks_from: test
       vars:
+        beaker_puppet_module: "puppet-candlepin"
         beaker_os: "{{ pipeline_os | regex_replace('-stream', '') }}"
+        beaker_environment:
+          BEAKER_FACTER_CANDLEPIN_VERSION: "{{ pipeline_version }}"
diff --git a/roles/beaker/defaults/main.yml b/roles/beaker/defaults/main.yml
@@ -0,0 +1,6 @@
+beaker_base_environment:
+  BEAKER_HYPERVISOR: "docker"
+  BEAKER_provision: "yes"
+  BEAKER_setfile: "{{ beaker_os }}-64{hostname={{ beaker_os }}-64.example.com}"
+  BEAKER_destroy: "no"
+beaker_environment: {}
diff --git a/roles/beaker/tasks/test.yml b/roles/beaker/tasks/test.yml
@@ -0,0 +1,5 @@
+- name: Run acceptance tests
+  command: bundle exec rake beaker
+  args:
+    chdir: "/src/{{ beaker_puppet_module }}"
+  environment: "{{ beaker_base_environment | ansible.builtin.combine(beaker_environment) }}"