Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for O2O execution in CC7 #22209

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions CondCore/CondDB/interface/Utils.h
Expand Up @@ -10,6 +10,7 @@
#include <tuple>
#include <fstream>
#include <unistd.h>
#include <pwd.h>
#include <climits>
//
#include <boost/regex.hpp>
Expand Down Expand Up @@ -50,10 +51,9 @@ namespace cond {
}

inline std::string getUserName(){
char username[LOGIN_NAME_MAX];
int retcode = getlogin_r(username,LOGIN_NAME_MAX);
if( retcode ) return "";
return std::string(username);
struct passwd* user_creds = getpwuid(getuid());
if (user_creds==NULL) return std::string("USER_NOT_AVAILABLE");
return std::string(user_creds->pw_name);
}

inline std::string getHostName(){
Expand Down
5 changes: 5 additions & 0 deletions CondTools/Ecal/test/BuildFile.xml
@@ -0,0 +1,5 @@
<use name="CondTools/Ecal"/>

<architecture name="slc.*_amd64_.*">
<test name="EcalDAQ_O2O_test" command="EcalDAQ_O2O_test.sh"/>
</architecture>
7 changes: 7 additions & 0 deletions CondTools/Ecal/test/EcalDAQ_O2O_test.sh
@@ -0,0 +1,7 @@
#!/bin/sh
conddb --yes copy EcalDAQTowerStatus_online --destdb EcalDAQTowerStatus_online_O2OTEST.db --o2oTest
popconRun ./src/CondTools/Ecal/python/EcalDAQ_popcon.py -d sqlite_file:EcalDAQTowerStatus_online_O2OTEST.db -t EcalDAQTowerStatus_online -c
ret=$?
conddb --db EcalDAQTowerStatus_online_O2OTEST.db list EcalDAQTowerStatus_online
echo "return code is $ret"
exit $ret
5 changes: 5 additions & 0 deletions CondTools/RunInfo/test/BuildFile.xml
@@ -0,0 +1,5 @@
<use name="CondTools/RunInfo"/>

<architecture name="slc.*_amd64_.*">
<test name="RunInfoStart_O2O_test" command="RunInfoStart_O2O_test.sh"/>
</architecture>
9 changes: 9 additions & 0 deletions CondTools/RunInfo/test/RunInfoStart_O2O_test.sh
@@ -0,0 +1,9 @@
#!/bin/sh
conddb --yes copy runinfo_start_31X_hlt --destdb runinfo_O2O_test.db --o2oTest
lastRun=`conddb listRuns | tail -2 | awk '{print $1}'`
echo "last run = $lastRun"
cmsRun ./src/CondTools/RunInfo/python/RunInfoPopConAnalyzer.py runNumber=$lastRun destinationConnection=sqlite_file:runinfo_O2O_test.db tag=runinfo_start_31X_hlt
ret=$?
conddb --db runinfo_O2O_test.db list runinfo_start_31X_hlt
echo "return code is $ret"
exit $ret