From f0fb226c1981def4e6b8f1e13c8eff03275d56a0 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Dec 2023 11:43:26 +0000 Subject: [PATCH] Add refresh support for all Red Hat versions Pick-to: 6.6 6.5 6.2 5.15 Change-Id: I1fbfadf70a9b7dbf0f738aa41d627adfac6138c5 Reviewed-by: Jani Heikkinen (cherry picked from commit 3c5d9cabf0c306106bf91b59deb9c5d5284b70bb) Reviewed-by: Qt Cherry-pick Bot --- .../01-refresh-subscription-manager.sh | 5 +++-- .../01-refresh-subscription-manager.sh | 2 +- .../01-refresh-subscription-manager.sh | 2 +- .../01-refresh-subscription-manager.sh | 5 +++-- .../01-refresh-subscription-manager.sh | 3 ++- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-refresh-subscription-manager.sh index 88f675df..1d46a5d0 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-refresh-subscription-manager.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash -# Copyright (C) 2020 The Qt Company Ltd. + +# Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only set -e -curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null sudo chmod 755 /tmp/redhat_ak.sh /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-refresh-subscription-manager.sh index 161d795b..1d46a5d0 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-refresh-subscription-manager.sh @@ -5,7 +5,7 @@ set -e -curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null sudo chmod 755 /tmp/redhat_ak.sh /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-refresh-subscription-manager.sh index cd2eb607..1d46a5d0 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-refresh-subscription-manager.sh @@ -5,7 +5,7 @@ set -e -curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null sudo chmod 755 /tmp/redhat_ak.sh /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-refresh-subscription-manager.sh index 88f675df..1d46a5d0 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-refresh-subscription-manager.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash -# Copyright (C) 2020 The Qt Company Ltd. + +# Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only set -e -curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null sudo chmod 755 /tmp/redhat_ak.sh /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-refresh-subscription-manager.sh index f6ccbd4f..1d46a5d0 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-refresh-subscription-manager.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-refresh-subscription-manager.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash + # Copyright (C) 2023 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only set -e -curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null sudo chmod 755 /tmp/redhat_ak.sh /tmp/redhat_ak.sh