From ecaba47acbf894f8db8c3e1ecebe39b2c3d5564b Mon Sep 17 00:00:00 2001 From: to-bar <46519524+to-bar@users.noreply.github.com> Date: Thu, 26 May 2022 15:09:33 +0000 Subject: [PATCH 1/2] Ensure ca-certificates package is in the latest version --- CHANGELOG-1.0.md | 6 ++++++ .../download-requirements/centos-7/download-requirements.sh | 3 +++ .../download-requirements/redhat-7/download-requirements.sh | 3 +++ 3 files changed, 12 insertions(+) diff --git a/CHANGELOG-1.0.md b/CHANGELOG-1.0.md index 81a1dacea6..df61ddafbd 100644 --- a/CHANGELOG-1.0.md +++ b/CHANGELOG-1.0.md @@ -1,5 +1,11 @@ # Changelog 1.0 +## [1.0.4] 2022-xx-xx + +### Fixed + +- [#3165](https://github.com/epiphany-platform/epiphany/issues/3165) - [CentOS/RHEL] download-requirements.sh fails due to expired certificate + ## [1.0.3] 2022-05-16 ### Added diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh index 9d4de7fbf0..bedfec63ac 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/centos-7/download-requirements.sh @@ -571,6 +571,9 @@ else fi fi +# Ensure ca-certificates package is in the latest version +run_cmd_with_retries yum install -y ca-certificates 3 + # --- Install required packages unless present --- # repos can be enabled or disabled using the yum-config-manager command, which is provided by yum-utils package diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh index 81ed649aad..c9688f8ee9 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh @@ -588,6 +588,9 @@ else fi fi +# Ensure ca-certificates package is in the latest version +run_cmd_with_retries yum install -y ca-certificates 3 + # Fix for RHUI client certificate expiration [#2319] if is_repo_enabled "rhui-microsoft-azure-rhel"; then run_cmd_with_retries yum update -y --disablerepo='*' --enablerepo='rhui-microsoft-azure-rhel*' 3 From d76119ddd37e664f4a6683a1e4879cb704eed29e Mon Sep 17 00:00:00 2001 From: to-bar <46519524+to-bar@users.noreply.github.com> Date: Thu, 26 May 2022 16:12:43 +0000 Subject: [PATCH 2/2] Change command order --- .../download-requirements/redhat-7/download-requirements.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh index c9688f8ee9..bd4a693a2d 100644 --- a/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh +++ b/core/src/epicli/data/common/ansible/playbooks/roles/repository/files/download-requirements/redhat-7/download-requirements.sh @@ -588,14 +588,14 @@ else fi fi -# Ensure ca-certificates package is in the latest version -run_cmd_with_retries yum install -y ca-certificates 3 - # Fix for RHUI client certificate expiration [#2319] if is_repo_enabled "rhui-microsoft-azure-rhel"; then run_cmd_with_retries yum update -y --disablerepo='*' --enablerepo='rhui-microsoft-azure-rhel*' 3 fi +# Ensure ca-certificates package is in the latest version +run_cmd_with_retries yum install -y ca-certificates 3 + # --- Install required packages unless present --- # repos can be enabled or disabled using the yum-config-manager command, which is provided by yum-utils package