From 8d458ed5bb71850adffa01e88928e4141ffe042c Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 19 Jul 2023 13:46:18 -0700 Subject: [PATCH] Remove centos references for koji --- role-rocky-kojid-staging.yml | 16 ++++++++++++++-- role-rocky-kojid.yml | 16 ++++++++++++++-- role-rocky-kojihub-staging.yml | 15 +++++++++++++-- role-rocky-kojihub.yml | 15 +++++++++++++-- 4 files changed, 54 insertions(+), 8 deletions(-) diff --git a/role-rocky-kojid-staging.yml b/role-rocky-kojid-staging.yml index 6b33570..7ab16c4 100644 --- a/role-rocky-kojid-staging.yml +++ b/role-rocky-kojid-staging.yml @@ -43,15 +43,26 @@ # I also couldn't find an ansible built-in to do this - name: Enable the PowerTools repository ini_file: - dest: /etc/yum.repos.d/CentOS-Linux-PowerTools.repo + dest: /etc/yum.repos.d/Rocky-PowerTools.repo section: powertools option: enabled value: 1 owner: root group: root mode: '0644' + when: ansible_distribution_major_version == '8' + + - name: Enable the CRB repository + ini_file: + dest: /etc/yum.repos.d/rocky.repo + section: crb + option: enabled + value: 1 + owner: root + group: root + mode: '0644' + when: ansible_distribution_major_version|int >= '9' - # The CentOS extras repos has epel-release provided - name: Enable the EPEL repository yum: name: epel-release @@ -68,6 +79,7 @@ gpgcheck: true gpgkey: https://download.copr.fedorainfracloud.org/results/nalika/rockylinux-tools/pubkey.gpg enabled: true + when: ansible_distribution_major_version == '8' # Right now, we are not sure how or where we'll get our certificates. So we # are presenting a choice by setting a variable, koji_internal_ca. There is a diff --git a/role-rocky-kojid.yml b/role-rocky-kojid.yml index a8fe405..03af1a1 100644 --- a/role-rocky-kojid.yml +++ b/role-rocky-kojid.yml @@ -43,15 +43,26 @@ # I also couldn't find an ansible built-in to do this - name: Enable the PowerTools repository ini_file: - dest: /etc/yum.repos.d/CentOS-Linux-PowerTools.repo + dest: /etc/yum.repos.d/Rocky-PowerTools.repo section: powertools option: enabled value: 1 owner: root group: root mode: '0644' + when: ansible_distribution_major_version == '8' + + - name: Enable the CRB repository + ini_file: + dest: /etc/yum.repos.d/rocky.repo + section: crb + option: enabled + value: 1 + owner: root + group: root + mode: '0644' + when: ansible_distribution_major_version|int >= '9' - # The CentOS extras repos has epel-release provided - name: Enable the EPEL repository yum: name: epel-release @@ -68,6 +79,7 @@ gpgcheck: true gpgkey: https://download.copr.fedorainfracloud.org/results/nalika/rockylinux-tools/pubkey.gpg enabled: true + when: ansible_distribution_major_version == '8' # Right now, we are not sure how or where we'll get our certificates. So we # are presenting a choice by setting a variable, koji_internal_ca. There is a diff --git a/role-rocky-kojihub-staging.yml b/role-rocky-kojihub-staging.yml index e0a1be8..df0b15f 100644 --- a/role-rocky-kojihub-staging.yml +++ b/role-rocky-kojihub-staging.yml @@ -64,15 +64,26 @@ # I also couldn't find an ansible built-in to do this - name: Enable the PowerTools repository ini_file: - dest: /etc/yum.repos.d/CentOS-Linux-PowerTools.repo + dest: /etc/yum.repos.d/Rocky-PowerTools.repo section: powertools option: enabled value: 1 owner: root group: root mode: '0644' + when: ansible_distribution_major_version == '8' + + - name: Enable the CRB repository + ini_file: + dest: /etc/yum.repos.d/rocky.repo + section: crb + option: enabled + value: 1 + owner: root + group: root + mode: '0644' + when: ansible_distribution_major_version|int >= '9' - # The CentOS extras repos has epel-release provided - name: Enable the EPEL repository yum: name: epel-release diff --git a/role-rocky-kojihub.yml b/role-rocky-kojihub.yml index 7790731..2f948f1 100644 --- a/role-rocky-kojihub.yml +++ b/role-rocky-kojihub.yml @@ -64,15 +64,26 @@ # I also couldn't find an ansible built-in to do this - name: Enable the PowerTools repository ini_file: - dest: /etc/yum.repos.d/CentOS-Linux-PowerTools.repo + dest: /etc/yum.repos.d/Rocky-PowerTools.repo section: powertools option: enabled value: 1 owner: root group: root mode: '0644' + when: ansible_distribution_major_version == '8' + + - name: Enable the CRB repository + ini_file: + dest: /etc/yum.repos.d/rocky.repo + section: crb + option: enabled + value: 1 + owner: root + group: root + mode: '0644' + when: ansible_distribution_major_version|int >= '9' - # The CentOS extras repos has epel-release provided - name: Enable the EPEL repository yum: name: epel-release