From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 19A3940850 for ; Wed, 20 Mar 2024 13:11:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710940299; cv=none; b=c2JKbrV1yC8wZy56ORP5VTgfOCaBMuCk8omKUZcz098hLcKJWxmI0nsbgLkwb7uUm014mC/R7ESwNB8VzKrGtLTMpGsYyjguC5YGB4gr9suQztYI/gAb9OXIK5ugCAKUZ4SbKcvaI3oK1mTRfKz708laedcwvH1xH+nMBpa0imo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710940299; c=relaxed/simple; bh=KkbIQ4BA4g765mG0EbvaibFiDLDVquSiiAFrVLpiD2A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=L1hf8GTul444Wa4/K16s+/BljpDqnGZxDZF/OMz0XsTHVsSv4Ots+oqBA4OEepRM+9xykA9AZwWeO/epheWjtWbPoCdFaywuRMmGeCzm5uqcYDhfZbJMVeSIk3w6Mg7WmBYm9L5wcfewqNrh43mXuVpYkDPVTvSmjD+9cdtW9sQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=O0viK2Dw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="O0viK2Dw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BD860C43399; Wed, 20 Mar 2024 13:11:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1710940299; bh=KkbIQ4BA4g765mG0EbvaibFiDLDVquSiiAFrVLpiD2A=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=O0viK2Dw4O0Du5z6dTxxVb6uxeI5503pfmru1ce2Jt1cNFQHx5MBen5qCX5c+nwd9 eN014I+6eTF4EdbE979sg6f4CBGrzWXckrZLcvA79GX9JISI5urx7zYA9urtugxhM+ zkDKli/vaVMFGa8t3nOnAY2PlbjpRqIcLPgMa+R8KEdoa/vi8JMNeIdfpvn4xAr2B1 F8ILF6uKqU9C9XfWF7RL57Jnri/aJ9WmdA8Oto+MxWrUZxMsWe300JPC7eD6SloW2G 5+7kTSsu8UVB6EL8rIgDKFWoBO9Mr8yQ/AY8LrZ4B7w/NJl4DgXwFikMOE9Cqljvgm xyW+7jWD0hVkQ== From: Jeff Layton Date: Wed, 20 Mar 2024 09:11:30 -0400 Subject: [PATCH 7/8] redhat: fix up some install-deps cases for CentOS Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20240320-fixes-v1-7-d1567776ad50@kernel.org> References: <20240320-fixes-v1-0-d1567776ad50@kernel.org> In-Reply-To: <20240320-fixes-v1-0-d1567776ad50@kernel.org> To: kdevops@lists.linux.dev Cc: Jeff Layton X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1575; i=jlayton@kernel.org; h=from:subject:message-id; bh=KkbIQ4BA4g765mG0EbvaibFiDLDVquSiiAFrVLpiD2A=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBl+uCHuO/vUBPs9XXPTGTPLFUjULqb2ExxIGFZT dreHk8eJ3iJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCZfrghwAKCRAADmhBGVaC FXH/EAC2AJWMiD9USpir6H3HIeiNSo+LdW6Jm95QfxILkZptu6OxoeLAPTAhjpot8+oPqD9j3bw UTEzyqRwZExYpx4mTh3f+KVB81eGWZc/azvdMvJL7m674/LXfnSqufct6mnUU9u/pdXxX+dNgxQ QO+YcMFshr3epZmgn5ClYhFC62NvMyzvAwsqdxTZaWSqKB3iI3zfcfykQltz/gNCB1aBQ3KfAWx UXP4Ec8UXSG2uhAIeYh23hqf5f5gVYkf5fbRMeJonh1vIhlqXimeEDVNsQTRuDDs+6+33UE3R3s TkagbAZB3OXOnz8e352gYDVbnv9TkWTHhW/OvdafnEJBAleHxbBHgZ37EOLZKTk0abFtx8+Qnzw QezRMCJbEdq3g9nLUo2q43J6iDxtDhvJL7jgDKk0Tv7BFxV8zBGnzgmjxtns5ySJx1yZ9bCyZjg HROI8Lbfk8M5Hi5kituaO7xD6QM/Zm/6zl11EXJgzHzhyNK2Ij3EqZLjMqFFFRPLG08bGFYb0LD ys3p80Xscx+CFsnfWu35bQkHFmuxFRzE2Z0ewXjXToXNpLeufNz1Nx7yu6RywNxk0tADBLqPK9D r0TPfhFFm2Fzg5dOx2UzqXTbeITyzx8gismhwbiLKDXnPWPIwOVzAhyNb3xhFSPRp7MWMaPJ8RM j2SluULnP4ONduw== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 Fix up some "when" cases for install-deps in ktls and pynfs. Signed-off-by: Jeff Layton --- playbooks/roles/ktls/tasks/install-deps/redhat/main.yml | 2 +- playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml b/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml index 5d6a18c9d6c3..802ef2a4c3ed 100644 --- a/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/ktls/tasks/install-deps/redhat/main.yml @@ -9,7 +9,7 @@ set_fact: epel_package: - epel-release - when: ansible_distribution == 'OracleLinux' + when: ansible_distribution == 'OracleLinux' or ansible_distribution == 'CentOS' - name: Install epel-release become: yes diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml index 9a133c0da661..be5ded1da8df 100644 --- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml @@ -3,8 +3,7 @@ become: yes command: /usr/bin/dnf config-manager --enable codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rpms when: - - rhel_org_id is defined - - rhel_activation_key is defined + - ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS' - name: Install build dependencies for pynfs become: yes -- 2.44.0