1
0
mirror of https://github.com/ohwgiles/laminar.git synced 2026-11-03 00:54:44 +00:00

add support for global, node and job level env files

This commit is contained in:
Oliver Giles
2015-09-19 14:55:16 +02:00
parent 1484f7a706
commit 291428ef2d
3 changed files with 25 additions and 3 deletions

View File

@@ -17,7 +17,7 @@
/// along with Laminar. If not, see <http://www.gnu.org/licenses/>
///
#include "run.h"
#include "conf.h"
#include <iostream>
#include <kj/debug.h>
@@ -26,7 +26,6 @@
#include <boost/filesystem.hpp>
namespace fs = boost::filesystem;
std::string to_string(const RunState& rs) {
switch(rs) {
case RunState::PENDING: return "pending";
@@ -47,8 +46,8 @@ Run::Run() {
Run::~Run() {
KJ_DBG("Run destroyed");
//delete log;
}
std::string Run::reason() const {
if(!parentName.empty()) {
return std::string("Triggered by upstream ") + parentName + " #" + std::to_string(parentBuild);
@@ -81,6 +80,13 @@ bool Run::step() {
chdir(wd.c_str());
for(std::string file : env) {
StringMap vars = parseConfFile(file.c_str());
for(auto& it : vars) {
setenv(it.first.c_str(), it.second.c_str(), true);
}
}
setenv("PATH", PATH.c_str(), true);
setenv("lBuildNum", buildNum.c_str(), true);
setenv("lJobName", name.c_str(), true);
@@ -110,6 +116,9 @@ bool Run::step() {
void Run::addScript(std::string script) {
scripts.push(script);
}
void Run::addEnv(std::string path) {
env.push_back(path);
}
void Run::reaped(int status) {
procStatus = status;
}