From 74bd39daca796fa4ad946b1b84aa8c42d6142792 Mon Sep 17 00:00:00 2001 From: Dominik Gedon Date: Thu, 12 Oct 2023 18:49:28 +0200 Subject: [PATCH] QE: Fix `update_ca()` for hostname rename tests (#7680) --- .../step_definitions/command_steps.rb | 3 ++- testsuite/features/support/commonlib.rb | 20 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb index 4b0e79ac0a66..d038827e78b4 100644 --- a/testsuite/features/step_definitions/command_steps.rb +++ b/testsuite/features/step_definitions/command_steps.rb @@ -1543,7 +1543,8 @@ end # Update the server CA certificate since it changed, otherwise all API and browser uses will fail - update_ca + update_ca('controller') + update_ca('proxy') # Reset the API client to take the new CA into account reset_api_client diff --git a/testsuite/features/support/commonlib.rb b/testsuite/features/support/commonlib.rb index 492891c45cbb..55dcc02d84d7 100644 --- a/testsuite/features/support/commonlib.rb +++ b/testsuite/features/support/commonlib.rb @@ -416,11 +416,21 @@ def file_inject(node, local_file, remote_file) end # This function updates the server certificate on the controller node -def update_ca +def update_ca(node) server_ip = get_target('server').public_ip server_name = get_target('server').full_hostname - puts `rm /etc/pki/trust/anchors/*; - wget http://#{server_ip}/pub/RHN-ORG-TRUSTED-SSL-CERT -O /etc/pki/trust/anchors/#{server_name}.cert && - update-ca-certificates && - certutil -d sql:/root/.pki/nssdb -A -t TC -n "susemanager" -i /etc/pki/trust/anchors/#{server_name}.cert` + + case node + when 'proxy' + command = "wget http://#{server_ip}/pub/RHN-ORG-TRUSTED-SSL-CERT -O /etc/pki/trust/anchors/RHN-ORG-TRUSTED-SSL-CERT; " \ + 'update-ca-certificates;' + get_target('proxy').run('rm /etc/pki/trust/anchors/RHN-ORG-TRUSTED-SSL-CERT', verbose: true) + get_target('proxy').run(command, verbose: true) + else + # controller + puts `rm /etc/pki/trust/anchors/*; + wget http://#{server_ip}/pub/RHN-ORG-TRUSTED-SSL-CERT -O /etc/pki/trust/anchors/#{server_name}.cert && + update-ca-certificates && + certutil -d sql:/root/.pki/nssdb -A -t TC -n "susemanager" -i /etc/pki/trust/anchors/#{server_name}.cert` + end end