From patchwork Wed Mar 5 00:57:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Mayhew X-Patchwork-Id: 14001727 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 DD61B7FBA2 for ; Wed, 5 Mar 2025 00:58:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741136284; cv=none; b=q8YQRkNtfBtz9RLOcH2g9plG7OjOAtidoht82VBpDZymidn+2hg9Qyx9MX9skVQB9PoWgtwJt5s6m75CsFmhIyUEKsxM4SXiNOFKuwYTj9he1NJTQjP69A7zamtDGoUfhellQF6Zf5/dLLbC59g6zX87hNjX42GJTiAjX8G4E1w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741136284; c=relaxed/simple; bh=aFR2CNzWJ7eYwuTCGuoR5kdZypRvVXgDFL+1IkTc/BE=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:content-type; b=Zot5kAKsCyQ9AYMoH6GjiVwLMkH8D3U+CK1eEUleaoRStzhwkMVvPdjAMTkeaxGGIlFS1nNNhH/izt9z81rteyl4djd1mVQ1bNtp/3nGWMtbR1l9C25X9Nd/vDbFXsbDW381t61tcrdw+ydFxb0z/eYaeojKKNrM5NnBwMDIdTc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=C70eMWW6; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="C70eMWW6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1741136280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GgAoInSg0WE1Mt0jJ8LTV7PLEXWsQNo3M8QoEgszzqw=; b=C70eMWW6F5l3iqcwxQzFn68c0t47SNJD0yFADNCfjNVyWHWrthnC0YUMNTsRpCPjhI5Vak dcT1wubITsZWVSWeHmn7vuOGT4lYR8UMY+iGvXE0Wtzp7PCvzhjLOYCLwQudWwdWgzW70t yx8NJQ3TEoshvrWACYcjShn5T2IZc5g= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-517-jMDCxEVOPTSiGOHcoe1Ptg-1; Tue, 04 Mar 2025 19:57:59 -0500 X-MC-Unique: jMDCxEVOPTSiGOHcoe1Ptg-1 X-Mimecast-MFC-AGG-ID: jMDCxEVOPTSiGOHcoe1Ptg_1741136279 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E8C921944D44 for ; Wed, 5 Mar 2025 00:57:58 +0000 (UTC) Received: from aion.redhat.com (unknown [10.22.64.10]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id BD91F1944DF0 for ; Wed, 5 Mar 2025 00:57:58 +0000 (UTC) Received: from aion.redhat.com (localhost [IPv6:::1]) by aion.redhat.com (Postfix) with ESMTP id E91AE337296 for ; Tue, 04 Mar 2025 19:57:55 -0500 (EST) From: Scott Mayhew To: kdevops@lists.linux.dev Subject: [PATCH] Don't include the codereadyrepo role if we're using a custom yum repofile Date: Tue, 4 Mar 2025 19:57:55 -0500 Message-ID: <20250305005755.697599-12-smayhew@redhat.com> In-Reply-To: <20250305005755.697599-1-smayhew@redhat.com> References: <20250305005755.697599-1-smayhew@redhat.com> Precedence: bulk X-Mailing-List: kdevops@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 5PeKg__Rb9jDI3DC2DkYAzmEUNagz0i7qBU88hk4Vhg_1741136279 X-Mimecast-Originator: redhat.com content-type: text/plain; charset="US-ASCII"; x-default=true If we're using a custom yum repofile, there's no guarantee the CRB repo follows the expected naming convention or that a CRB repo even exists for our setup. Signed-off-by: Scott Mayhew --- playbooks/roles/codereadyrepo/tasks/main.yml | 5 ----- playbooks/roles/fstests/tasks/install-deps/redhat/main.yml | 1 + playbooks/roles/ltp/tasks/main.yml | 1 + playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml | 3 ++- playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml | 1 + 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/playbooks/roles/codereadyrepo/tasks/main.yml b/playbooks/roles/codereadyrepo/tasks/main.yml index 1b8bad0..45e6f7a 100644 --- a/playbooks/roles/codereadyrepo/tasks/main.yml +++ b/playbooks/roles/codereadyrepo/tasks/main.yml @@ -4,7 +4,6 @@ codeready_repo: "codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rpms" when: - ansible_distribution == 'RedHat' - - not devconfig_custom_yum_repofile - kdevops_enable_guestfs - name: Select the Oracle Linux CodeReady Builder repo @@ -12,14 +11,12 @@ codeready_repo: "ol9_codeready_builder" when: - ansible_distribution == 'OracleLinux' - - not devconfig_custom_yum_repofile - name: Select the CentOS CodeReady Builder repo ansible.builtin.set_fact: codeready_repo: "crb" when: - ansible_distribution == 'CentOS' - - not devconfig_custom_yum_repofile - kdevops_enable_guestfs - name: Select the AWS RHEL CodeReady Builder repo @@ -27,7 +24,6 @@ codeready_repo: "codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-rhui-rpms" when: - ansible_distribution == 'RedHat' - - not devconfig_custom_yum_repofile - kdevops_enable_terraform - kdevops_terraform_provider == "aws" @@ -36,7 +32,6 @@ codeready_repo: "codeready-builder-for-rhel-{{ ansible_distribution_major_version }}-{{ ansible_architecture }}-rhui-rpms" when: - ansible_distribution == 'RedHat' - - not devconfig_custom_yum_repofile - kdevops_enable_terraform - kdevops_terraform_provider == "azure" diff --git a/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml b/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml index 52b4bce..c8df399 100644 --- a/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/fstests/tasks/install-deps/redhat/main.yml @@ -4,6 +4,7 @@ name: codereadyrepo when: - ansible_distribution != "Fedora" + - not devconfig_custom_yum_repofile - name: Enable installation of packages from EPEL ansible.builtin.include_role: diff --git a/playbooks/roles/ltp/tasks/main.yml b/playbooks/roles/ltp/tasks/main.yml index b15f87d..f6cf97a 100644 --- a/playbooks/roles/ltp/tasks/main.yml +++ b/playbooks/roles/ltp/tasks/main.yml @@ -48,6 +48,7 @@ when: - ansible_os_family == "RedHat" - ansible_distribution != "Fedora" + - not devconfig_custom_yum_repofile - name: Install dependencies for ltp tags: ['build', 'ltp'] diff --git a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml index b98ff67..2375e93 100644 --- a/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/pynfs/tasks/install-deps/redhat/main.yml @@ -3,7 +3,8 @@ ansible.builtin.include_role: name: codereadyrepo when: - ansible_distribution != "Fedora" + - ansible_distribution != "Fedora" + - not devconfig_custom_yum_repofile - name: Install build dependencies for pynfs become: yes diff --git a/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml b/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml index d5021e0..47832b2 100644 --- a/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml +++ b/playbooks/roles/sysbench/tasks/install-deps/redhat/main.yml @@ -4,6 +4,7 @@ name: codereadyrepo when: - ansible_distribution != "Fedora" + - not devconfig_custom_yum_repofile - name: Enable installation of packages from EPEL ansible.builtin.include_role: