From a4dc5635d4d306869194841df1cfeca878237e74 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 4 Jan 2024 11:16:34 +0100 Subject: [PATCH] allow overriding the server/proxy OS this enables mixed-OS testing --- pipelines/vars/forklift_clone.yml | 2 +- pipelines/vars/forklift_foreman.yml | 2 +- pipelines/vars/forklift_katello.yml | 4 ++-- pipelines/vars/forklift_luna.yml | 4 ++-- pipelines/vars/forklift_plugins.yml | 2 +- pipelines/vars/forklift_pulpcore.yml | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pipelines/vars/forklift_clone.yml b/pipelines/vars/forklift_clone.yml index 8cadb243a..f134d35e7 100644 --- 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 index 60f5fa8bf..28c3085dc 100644 --- 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 index 2f10f2405..abf152871 100644 --- 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 index ed1bcc7f5..efeb1e51f 100644 --- 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 index b467d9e70..ff5edb136 100644 --- 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 index 946245a3d..8bb7760b0 100644 --- 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: