Enable content proxy testing on EL8 Katello pipelines

theforeman · Jan 29, 2021 · 6d291e4 · 6d291e4
1 parent c974358
commit 6d291e4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pipelines/vars/forklift_katello.yml b/pipelines/vars/forklift_katello.yml
@@ -14,7 +14,7 @@ server_box:
         - "--puppet-server-jvm-min-heap-size 1G"
         - "--puppet-server-jvm-max-heap-size 1G"
       bats_tests_additional:
-        "{{ ['fb-katello-proxy.bats'] if pipeline_os != 'centos8' else [] }}"
+        - fb-katello-proxy.bats
 proxy_box:
   box: "{{ pipeline_os }}"
   memory: 3072
@@ -27,4 +27,4 @@ proxy_box:
       foreman_installer_additional_packages:
         - foreman-proxy-content
 forklift_boxes:
-  "{{ {forklift_server_name: server_box, forklift_smoker_name: smoker_box} | combine({forklift_proxy_name: proxy_box} if pipeline_os != 'centos8' else {}) }}"
+  "{{ {forklift_server_name: server_box, forklift_proxy_name: proxy_box, forklift_smoker_name: smoker_box} }}"