From 869731d01f96aaad462ea77ebfe8f4966f2a0f73 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Wed, 23 Aug 2023 09:56:33 -0500 Subject: [PATCH 1/4] bump release number for osg 23 el8 rebuild --- rpm/osg-flock.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/osg-flock.spec b/rpm/osg-flock.spec index f901fb9c..03104eae 100644 --- a/rpm/osg-flock.spec +++ b/rpm/osg-flock.spec @@ -1,6 +1,6 @@ Name: osg-flock Version: 1.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: OSG configurations for a flocking host License: Apache 2.0 From 62099d9d603d36e1661d8f110e862e1c323f2c9a Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Mon, 21 Oct 2024 13:18:15 -0500 Subject: [PATCH 2/4] rename rpm, replace in-text references to osg-flock (keep file paths the same) --- node-check/osgvo-node-advertise | 2 +- ospool-pilot/itb/pilot/advertise-userenv | 2 +- ospool-pilot/main/pilot/advertise-userenv | 2 +- ospool-pilot/old/pilot/advertise-userenv | 2 +- rpm/{osg-flock.spec => ospool-ap.spec} | 10 ++++++++-- wip-node-check/osgvo-advertise-userenv | 2 +- 6 files changed, 13 insertions(+), 7 deletions(-) rename rpm/{osg-flock.spec => ospool-ap.spec} (93%) diff --git a/node-check/osgvo-node-advertise b/node-check/osgvo-node-advertise index 845450e6..92fe1b8a 100755 --- a/node-check/osgvo-node-advertise +++ b/node-check/osgvo-node-advertise @@ -204,7 +204,7 @@ find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \; find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \; if [ "x$OSG_SINGULARITY_REEXEC" = "x" ]; then - info "This is a setup script for the OSG-FLOCK frontend." + info "This is a setup script for the OSPOOL-AP frontend." info "In case of problems, contact Mats Rynge (rynge@isi.edu)" info "Running in directory $PWD" diff --git a/ospool-pilot/itb/pilot/advertise-userenv b/ospool-pilot/itb/pilot/advertise-userenv index 1f3b713d..e41bd6d7 100755 --- a/ospool-pilot/itb/pilot/advertise-userenv +++ b/ospool-pilot/itb/pilot/advertise-userenv @@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \; find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \; find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \; -info "This is a setup script for the OSG-FLOCK frontend." +info "This is a setup script for the OSPOOL-AP frontend." info "In case of problems, contact Mats Rynge (rynge@isi.edu)" info "Running in directory $PWD" diff --git a/ospool-pilot/main/pilot/advertise-userenv b/ospool-pilot/main/pilot/advertise-userenv index 1f3b713d..e41bd6d7 100755 --- a/ospool-pilot/main/pilot/advertise-userenv +++ b/ospool-pilot/main/pilot/advertise-userenv @@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \; find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \; find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \; -info "This is a setup script for the OSG-FLOCK frontend." +info "This is a setup script for the OSPOOL-AP frontend." info "In case of problems, contact Mats Rynge (rynge@isi.edu)" info "Running in directory $PWD" diff --git a/ospool-pilot/old/pilot/advertise-userenv b/ospool-pilot/old/pilot/advertise-userenv index 1f3b713d..e41bd6d7 100755 --- a/ospool-pilot/old/pilot/advertise-userenv +++ b/ospool-pilot/old/pilot/advertise-userenv @@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \; find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \; find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \; -info "This is a setup script for the OSG-FLOCK frontend." +info "This is a setup script for the OSPOOL-AP frontend." info "In case of problems, contact Mats Rynge (rynge@isi.edu)" info "Running in directory $PWD" diff --git a/rpm/osg-flock.spec b/rpm/ospool-ap.spec similarity index 93% rename from rpm/osg-flock.spec rename to rpm/ospool-ap.spec index 03104eae..7832a09f 100644 --- a/rpm/osg-flock.spec +++ b/rpm/ospool-ap.spec @@ -1,10 +1,10 @@ -Name: osg-flock +Name: ospool-ap Version: 1.9 Release: 3%{?dist} Summary: OSG configurations for a flocking host License: Apache 2.0 -URL: https://opensciencegrid.org/docs/submit/osg-flock +URL: https://opensciencegrid.org/docs/submit/ospool-ap BuildArch: noarch @@ -12,6 +12,9 @@ Requires(post): gratia-probe-condor-ap BuildRequires: condor Requires: condor +Obsoletes: osg-flock <= %{version} +Provides: osg-flock = %{version} + Source0: %{name}-%{version}%{?gitrev:-%{gitrev}}.tar.gz %description @@ -68,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Oct 21 2024 Matt Westphall - 1.9-3 +- Initial release as ospool-ap + * Tue Feb 21 2023 Mats Rynge - 1.9-1 - Add OSPool attribute to the job ad from the EP config (SOFTWARE-4803) diff --git a/wip-node-check/osgvo-advertise-userenv b/wip-node-check/osgvo-advertise-userenv index 376add79..b849a03b 100755 --- a/wip-node-check/osgvo-advertise-userenv +++ b/wip-node-check/osgvo-advertise-userenv @@ -91,7 +91,7 @@ find . -maxdepth 1 -name $TEST_FILE_1H.\* -mmin +60 -exec rm {} \; find . -maxdepth 1 -name $TEST_FILE_4H.\* -mmin +240 -exec rm {} \; find . -maxdepth 1 -name adv-singularity-work.\* -mmin +240 -exec rm -rf {} \; -info "This is a setup script for the OSG-FLOCK frontend." +info "This is a setup script for the OSPOOL-AP frontend." info "In case of problems, contact Mats Rynge (rynge@isi.edu)" info "Running in directory $PWD" From 5a07f65fbbbd7aa7854ea459e1e558c8c6780e75 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Mon, 21 Oct 2024 13:22:00 -0500 Subject: [PATCH 3/4] bump release number --- rpm/ospool-ap.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/ospool-ap.spec b/rpm/ospool-ap.spec index 7832a09f..46dd8e1a 100644 --- a/rpm/ospool-ap.spec +++ b/rpm/ospool-ap.spec @@ -1,6 +1,6 @@ Name: ospool-ap Version: 1.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: OSG configurations for a flocking host License: Apache 2.0 @@ -71,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Oct 21 2024 Matt Westphall - 1.9-3 +* Mon Oct 21 2024 Matt Westphall - 1.9-4 - Initial release as ospool-ap * Tue Feb 21 2023 Mats Rynge - 1.9-1 From ba73a63ce3bea7619275dcd4feca40b05351413f Mon Sep 17 00:00:00 2001 From: mwestphall Date: Tue, 29 Oct 2024 10:09:05 -0500 Subject: [PATCH 4/4] Update rpm/ospool-ap.spec Co-authored-by: Brian Lin --- rpm/ospool-ap.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpm/ospool-ap.spec b/rpm/ospool-ap.spec index 46dd8e1a..38f063ad 100644 --- a/rpm/ospool-ap.spec +++ b/rpm/ospool-ap.spec @@ -1,7 +1,7 @@ Name: ospool-ap Version: 1.9 Release: 4%{?dist} -Summary: OSG configurations for a flocking host +Summary: OSPool Access Point configurations License: Apache 2.0 URL: https://opensciencegrid.org/docs/submit/ospool-ap