allow overriding the server/proxy OS

this enables mixed-OS testing
theforeman · Jan 5, 2024 · a4dc563 · a4dc563
1 parent 7d5a7f2
commit a4dc563
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/pipelines/vars/forklift_clone.yml b/pipelines/vars/forklift_clone.yml
@@ -1,5 +1,5 @@
 server_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_server_os | default(pipeline_os) }}"
   memory: 8192
   ansible:
     variables:

diff --git a/pipelines/vars/forklift_foreman.yml b/pipelines/vars/forklift_foreman.yml
@@ -1,5 +1,5 @@
 server_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_server_os | default(pipeline_os) }}"
   memory: 4680
   ansible:
     variables:

diff --git a/pipelines/vars/forklift_katello.yml b/pipelines/vars/forklift_katello.yml
@@ -1,5 +1,5 @@
 server_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_server_os | default(pipeline_os) }}"
   memory: 10240
   ansible:
     variables:
@@ -17,7 +17,7 @@ server_box:
         - fb-katello-proxy.bats
         - "{{ 'fb-test-katello-change-hostname.bats' if pipeline_action == 'install' else ''}}"
 proxy_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_proxy_os | default(pipeline_os) }}"
   memory: 3072
   ansible:
     variables:

diff --git a/pipelines/vars/forklift_luna.yml b/pipelines/vars/forklift_luna.yml
@@ -1,5 +1,5 @@
 server_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_server_os | default(pipeline_os) }}"
   memory: 10240
   ansible:
     variables:
@@ -63,7 +63,7 @@ server_box:
         - "fb-katello-proxy.bats"
         - "{{ 'fb-test-katello-change-hostname.bats' if pipeline_action == 'install' else ''}}"
 proxy_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_proxy_os | default(pipeline_os) }}"
   memory: 3072
   ansible:
     variables:

diff --git a/pipelines/vars/forklift_plugins.yml b/pipelines/vars/forklift_plugins.yml
@@ -1,5 +1,5 @@
 server_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_server_os | default(pipeline_os) }}"
   memory: 8192
   ansible:
     variables:

diff --git a/pipelines/vars/forklift_pulpcore.yml b/pipelines/vars/forklift_pulpcore.yml
@@ -1,5 +1,5 @@
 server_box:
-  box: "{{ pipeline_os }}"
+  box: "{{ pipeline_server_os | default(pipeline_os) }}"
   memory: 4680
 
 forklift_boxes: