From 7fb7e019cf7a73a0fee453dbf14e7bab6497062a Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 10:53:46 +0100
Subject: [PATCH 01/12] htcondor.repo file for condor version 23.0

---
 files/mon/condor/htcondor.repo | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/files/mon/condor/htcondor.repo b/files/mon/condor/htcondor.repo
index e8abc1b..12007ea 100644
--- a/files/mon/condor/htcondor.repo
+++ b/files/mon/condor/htcondor.repo
@@ -1,27 +1,26 @@
 [htcondor]
 name=HTCondor for Enterprise Linux 9 - Release
-baseurl=https://research.cs.wisc.edu/htcondor/repo/10.x/el9/$basearch/release
+baseurl=https://research.cs.wisc.edu/htcondor/repo/23.0/el9/$basearch/release
 enabled=1
 gpgcheck=1
 repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.0-Key
 priority=90
 
 [htcondor-debuginfo]
 name=HTCondor for Enterprise Linux 9 - Release - Debug
-baseurl=https://research.cs.wisc.edu/htcondor/repo/10.x/el9/$basearch/release/debug
+baseurl=https://research.cs.wisc.edu/htcondor/repo/23.0/el9/$basearch/release/debug
 enabled=0
 gpgcheck=1
 repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.0-Key
 priority=90
 
 [htcondor-source]
 name=HTCondor for Enterprise Linux 9 - Release - Source
-baseurl=https://research.cs.wisc.edu/htcondor/repo/10.x/el9/$basearch/release/SRPMS
+baseurl=https://research.cs.wisc.edu/htcondor/repo/23.0/el9/$basearch/release/SRPMS
 enabled=0
 gpgcheck=1
 repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-10.x-Key
-priority=90
-
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.0-Key
+priority=90
\ No newline at end of file

From 3f919c739582032817e783ae438b083d01388313 Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 11:20:42 +0100
Subject: [PATCH 02/12] Option to skip repo configuration and package
 installation

---
 manifests/mon/condor.pp | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/manifests/mon/condor.pp b/manifests/mon/condor.pp
index c0c0f93..57728e5 100644
--- a/manifests/mon/condor.pp
+++ b/manifests/mon/condor.pp
@@ -1,5 +1,6 @@
 class argo::mon::condor (
-  $local_config='puppet:///modules/argo/mon/condor/condor_config.local'
+  $local_config='puppet:///modules/argo/mon/condor/condor_config.local',
+  $handle_package=true
 ) {
 
   File {
@@ -9,14 +10,16 @@
     mode   => '0644',
   }
 
-  if (Integer($facts['os']['release']['major']) > 7) {
-    file { '/etc/yum.repos.d/htcondor.repo': 
-      source => 'puppet:///modules/argo/mon/condor/htcondor.repo',
-      mode   => '0644',
+  if ($handle_package) {
+    if (Integer($facts['os']['release']['major']) > 7) {
+      file { '/etc/yum.repos.d/htcondor.repo': 
+        source => 'puppet:///modules/argo/mon/condor/htcondor.repo',
+        mode   => '0644',
+      }
+    }
+    
+    package { 'condor': 
     }
-  }
-  
-  package { 'condor': 
   }
 
   file { '/etc/condor/condor_config.local':

From 74be36be79269ec373a312d918a66441ae137cb9 Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 11:26:15 +0100
Subject: [PATCH 03/12] Option to skip only repo configuration

---
 manifests/mon/condor.pp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/manifests/mon/condor.pp b/manifests/mon/condor.pp
index 57728e5..3fffe98 100644
--- a/manifests/mon/condor.pp
+++ b/manifests/mon/condor.pp
@@ -1,6 +1,6 @@
 class argo::mon::condor (
   $local_config='puppet:///modules/argo/mon/condor/condor_config.local',
-  $handle_package=true
+  $handle_repo=true
 ) {
 
   File {
@@ -10,16 +10,16 @@
     mode   => '0644',
   }
 
-  if ($handle_package) {
+  if ($handle_repo) {
     if (Integer($facts['os']['release']['major']) > 7) {
       file { '/etc/yum.repos.d/htcondor.repo': 
         source => 'puppet:///modules/argo/mon/condor/htcondor.repo',
         mode   => '0644',
       }
     }
+  }
     
-    package { 'condor': 
-    }
+  package { 'condor': 
   }
 
   file { '/etc/condor/condor_config.local':

From a05617477ef72fa6db9b2aa2f2d2727b0128aa28 Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 13:35:41 +0100
Subject: [PATCH 04/12] Option to set version of condor to be installed

---
 manifests/mon/condor.pp                | 12 +++++------
 templates/mon/condor/htcondor.repo.erb | 29 ++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 templates/mon/condor/htcondor.repo.erb

diff --git a/manifests/mon/condor.pp b/manifests/mon/condor.pp
index 3fffe98..ab11dcb 100644
--- a/manifests/mon/condor.pp
+++ b/manifests/mon/condor.pp
@@ -1,6 +1,6 @@
 class argo::mon::condor (
   $local_config='puppet:///modules/argo/mon/condor/condor_config.local',
-  $handle_repo=true
+  $version='10.x'
 ) {
 
   File {
@@ -10,12 +10,10 @@
     mode   => '0644',
   }
 
-  if ($handle_repo) {
-    if (Integer($facts['os']['release']['major']) > 7) {
-      file { '/etc/yum.repos.d/htcondor.repo': 
-        source => 'puppet:///modules/argo/mon/condor/htcondor.repo',
-        mode   => '0644',
-      }
+  if (Integer($facts['os']['release']['major']) > 7) {
+    file { '/etc/yum.repos.d/htcondor.repo': 
+      content => template('argo/mon/condor/htcondor.repo.erb'),
+      mode   => '0644',
     }
   }
     
diff --git a/templates/mon/condor/htcondor.repo.erb b/templates/mon/condor/htcondor.repo.erb
new file mode 100644
index 0000000..d880deb
--- /dev/null
+++ b/templates/mon/condor/htcondor.repo.erb
@@ -0,0 +1,29 @@
+[htcondor]
+name=HTCondor for Enterprise Linux 9 - Release
+baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/el9/$basearch/release
+enabled=1
+<% if @version == 'True' -%>
+skip_if_unavailable=True
+<% end -%>
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-<%= @version  %>-Key
+priority=90
+
+[htcondor-debuginfo]
+name=HTCondor for Enterprise Linux 9 - Release - Debug
+baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/el9/$basearch/release/debug
+enabled=0
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-<%= @version  %>-Key
+priority=90
+
+[htcondor-source]
+name=HTCondor for Enterprise Linux 9 - Release - Source
+baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/el9/$basearch/release/SRPMS
+enabled=0
+gpgcheck=1
+repo_gpgcheck=1
+gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-<%= @version  %>-Key
+priority=90
\ No newline at end of file

From e8fc8e1d33c37213abb39ac391072ed5a7879f5e Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 13:39:00 +0100
Subject: [PATCH 05/12] Fix a typo in htcondor.repo template

---
 templates/mon/condor/htcondor.repo.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/mon/condor/htcondor.repo.erb b/templates/mon/condor/htcondor.repo.erb
index d880deb..4724553 100644
--- a/templates/mon/condor/htcondor.repo.erb
+++ b/templates/mon/condor/htcondor.repo.erb
@@ -2,7 +2,7 @@
 name=HTCondor for Enterprise Linux 9 - Release
 baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/el9/$basearch/release
 enabled=1
-<% if @version == 'True' -%>
+<% if @version == '10.x' -%>
 skip_if_unavailable=True
 <% end -%>
 gpgcheck=1

From 4cbc28dae56d986cf24e407612543cde2c53e55a Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 15:21:40 +0100
Subject: [PATCH 06/12] Option to mark htcondor repo as enabled or disabled

---
 manifests/mon/condor.pp                | 1 +
 templates/mon/condor/htcondor.repo.erb | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/manifests/mon/condor.pp b/manifests/mon/condor.pp
index ab11dcb..28acbf5 100644
--- a/manifests/mon/condor.pp
+++ b/manifests/mon/condor.pp
@@ -1,6 +1,7 @@
 class argo::mon::condor (
   $local_config='puppet:///modules/argo/mon/condor/condor_config.local',
   $version='10.x'
+  $enabled=1
 ) {
 
   File {
diff --git a/templates/mon/condor/htcondor.repo.erb b/templates/mon/condor/htcondor.repo.erb
index 4724553..dc5afeb 100644
--- a/templates/mon/condor/htcondor.repo.erb
+++ b/templates/mon/condor/htcondor.repo.erb
@@ -1,10 +1,7 @@
 [htcondor]
 name=HTCondor for Enterprise Linux 9 - Release
 baseurl=https://research.cs.wisc.edu/htcondor/repo/<%= @version  %>/el9/$basearch/release
-enabled=1
-<% if @version == '10.x' -%>
-skip_if_unavailable=True
-<% end -%>
+enabled=<%= @enabled %>
 gpgcheck=1
 repo_gpgcheck=1
 gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-<%= @version  %>-Key

From 885069fb10144563e915c9d0e55587fb78a37088 Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 15:24:13 +0100
Subject: [PATCH 07/12] Add a missing comma

---
 manifests/mon/condor.pp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifests/mon/condor.pp b/manifests/mon/condor.pp
index 28acbf5..70f2202 100644
--- a/manifests/mon/condor.pp
+++ b/manifests/mon/condor.pp
@@ -1,6 +1,6 @@
 class argo::mon::condor (
   $local_config='puppet:///modules/argo/mon/condor/condor_config.local',
-  $version='10.x'
+  $version='10.x',
   $enabled=1
 ) {
 

From e3439c628e4b8f99fc276cdda5ffa2d80301c542 Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 15:26:57 +0100
Subject: [PATCH 08/12] Remove htcondor.repo file since it is no longer needed

---
 files/mon/condor/htcondor.repo | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 files/mon/condor/htcondor.repo

diff --git a/files/mon/condor/htcondor.repo b/files/mon/condor/htcondor.repo
deleted file mode 100644
index 12007ea..0000000
--- a/files/mon/condor/htcondor.repo
+++ /dev/null
@@ -1,26 +0,0 @@
-[htcondor]
-name=HTCondor for Enterprise Linux 9 - Release
-baseurl=https://research.cs.wisc.edu/htcondor/repo/23.0/el9/$basearch/release
-enabled=1
-gpgcheck=1
-repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.0-Key
-priority=90
-
-[htcondor-debuginfo]
-name=HTCondor for Enterprise Linux 9 - Release - Debug
-baseurl=https://research.cs.wisc.edu/htcondor/repo/23.0/el9/$basearch/release/debug
-enabled=0
-gpgcheck=1
-repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.0-Key
-priority=90
-
-[htcondor-source]
-name=HTCondor for Enterprise Linux 9 - Release - Source
-baseurl=https://research.cs.wisc.edu/htcondor/repo/23.0/el9/$basearch/release/SRPMS
-enabled=0
-gpgcheck=1
-repo_gpgcheck=1
-gpgkey=https://research.cs.wisc.edu/htcondor/repo/keys/HTCondor-23.0-Key
-priority=90
\ No newline at end of file

From c9b5a7deb104ac6ee2171985db3865e070e20ff6 Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 15:46:59 +0100
Subject: [PATCH 09/12] Add copr manifest

---
 files/mon/repos/copr.repo | 10 ++++++++++
 manifests/mon/copr.pp     | 16 ++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 files/mon/repos/copr.repo
 create mode 100644 manifests/mon/copr.pp

diff --git a/files/mon/repos/copr.repo b/files/mon/repos/copr.repo
new file mode 100644
index 0000000..366aa6f
--- /dev/null
+++ b/files/mon/repos/copr.repo
@@ -0,0 +1,10 @@
+[copr]
+name=Copr repo for PyPI owned by @copr
+baseurl=https://download.copr.fedorainfracloud.org/results/@copr/PyPI/epel-9-$basearch/
+type=rpm-md
+skip_if_unavailable=True
+gpgcheck=1
+gpgkey=https://download.copr.fedorainfracloud.org/results/@copr/PyPI/pubkey.gpg
+repo_gpgcheck=0
+enabled=1
+enabled_metadata=1
diff --git a/manifests/mon/copr.pp b/manifests/mon/copr.pp
new file mode 100644
index 0000000..8d06d49
--- /dev/null
+++ b/manifests/mon/copr.pp
@@ -0,0 +1,16 @@
+class argo::mon::copr () {
+
+  File {
+    ensure => present,
+    owner  => root,
+    group  => root,
+    mode   => '0644',
+  }
+
+  if (Integer($facts['os']['release']['major']) > 7) {
+    file { '/etc/yum.repos.d/copr.repo': 
+      source => 'puppet:///modules/argo/mon/repos/copr.repo',
+    }
+  }
+
+}

From 256b7d52944366817fe0d0579f21072dd610b4af Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Thu, 13 Feb 2025 15:47:24 +0100
Subject: [PATCH 10/12] Include copr for all sensu boxes

---
 manifests/mon.pp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/manifests/mon.pp b/manifests/mon.pp
index 08b194a..5d4d3f0 100644
--- a/manifests/mon.pp
+++ b/manifests/mon.pp
@@ -12,6 +12,7 @@
 ) {
   include yum::repo::argo
   include ::yum::repo::igtf
+  include argo::mon::copr
 
   if ($disable_ipv6) {
     include argo::mon::disable_ipv6

From 6e99aca298b10c3cc01f47f450d8c18b791adf94 Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Fri, 14 Feb 2025 09:14:20 +0100
Subject: [PATCH 11/12] Update documentation

---
 README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/README.md b/README.md
index 7a54185..d80e304 100644
--- a/README.md
+++ b/README.md
@@ -277,6 +277,20 @@ It is possible to override the configuration file, and it can be done by setting
 argo::mon::condor::local_config: puppet:///path/to/local_config/file
 ```
 
+It is possible to choose the version of condor you wish to have installed, in which case the proper `.repo` file is going to be created. It is set up in the yaml file like this:
+
+```yaml
+argo::mon::condor::version: '23.0'
+```
+
+If the version is not set explicitly, it is set to version `'10.x'` by default.
+
+It is also possible to disable the `htcondor.repo` by setting parameter `enable` to 0. By default it is enabled. Example of how to disable the repo:
+
+```yaml
+argo::mon::condor::enable: 0
+```
+
 #### ARC-CE probes
 
 For ARC-CE probes to work properly, besides the package providing the probes (`nordugrid-arc-nagios-plugins`), also packages `nordugrid-arc-nagios-plugins-egi`, `argo-probe-igtf` and `argo-probe-sensu` need to be additionally installed. There is also a configuration file that needs to be placed in proper directory (default file is `files/mon/egi/90-local.ini`). If The default file is sufficient, the `.yaml` file should simply contain:

From 0e14f1b3fae612481877fdbd35f5a7a887ddb4fb Mon Sep 17 00:00:00 2001
From: Katarina Zailac <katarina.zailac@gmail.com>
Date: Fri, 14 Feb 2025 09:21:41 +0100
Subject: [PATCH 12/12] Version bump

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d13830a..2216afd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 Release notes for argo-puppet module
 
+### 1.8.7 - 14 Feb 2025
+
+* AO-1018 Include COPR repo in ARGO Puppet module
+* AO-1019 Update htcondor repo in ARGO Puppet module
+
 ### 1.8.6 - 3 Dec 2024
 
 * AO-1008 Include nordugrid-arc-plugins-arcrest in argo-puppet module