Merge pull request #252 from edquist/SOFTWARE-4964.condor-blahp

allow blahp to be installed by dependency (SOFTWARE-4964)

Author: edquist

osgtest/tests/test_410_jobs.py

@@ -42,7 +42,8 @@ def run_job_in_tmp_dir(self, command, message, verify_environment=True):
         shutil.rmtree(tmp_dir)
 
     def test_01_condor_run_pbs(self):
-        core.skip_ok_unless_installed('condor', 'blahp')
+        core.skip_ok_unless_installed('condor')
+        core.skip_ok_unless_installed('blahp', by_dependency=True)
         core.skip_ok_unless_installed('torque-mom', 'torque-server', 'torque-scheduler', by_dependency=True)
         self.skip_bad_unless(core.state['jobs.env-set'], 'job environment not set')
         self.skip_bad_unless(service.is_running('condor'), 'condor not running')
@@ -54,7 +55,10 @@ def test_01_condor_run_pbs(self):
         # Figure out whether the installed BLAHP package is the same as or later
         # than "blahp-1.18.11.bosco-4.osg*" (in the RPM sense), because it's the
         # first build in which the job environments are correctly passed to PBS.
-        blahp_pbs_has_env_vars = core.PackageVersion('blahp') >= '1.18.11.bosco-4.osg'
+        # The 'condor-blahp' rpm obsoletes 'blahp' in 9.5.0 (SOFTWARE-4964)
+        blahp_pbs_has_env_vars = (
+            core.rpm_is_installed('condor-blahp') or
+            core.PackageVersion('blahp') >= '1.18.11.bosco-4.osg')
 
         self.run_job_in_tmp_dir(command, 'condor_run a Condor job', verify_environment=blahp_pbs_has_env_vars)
 

rpm/osg-test.spec

@@ -1,6 +1,6 @@
 Summary:   Tests an OSG Software installation
 Name:      osg-test
-Version:   3.2.0
+Version:   3.2.1
 Release:   1%{?dist}
 License:   Apache License, 2.0
 Group:     Applications/Grid
@@ -45,6 +45,9 @@ make install DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python}
 %{_sbindir}/%{name}-log-viewer
 
 %changelog
+* Thu Apr 14 2022 Carl Edquist <[email protected]> - 3.2.1-1
+- Allow condor-blahp rpm to be used in place of blahp (SOFTWARE-4964)
+
 * Mon Aug 23 2021 Matyas Selmeci <[email protected]> - 3.2.0-1
 - Use Python 3 on EL7 too