Skip to content

Commit

Permalink
Fix use of conda_env_name in condaEnv.
Browse files Browse the repository at this point in the history
whitequark committed Mar 26, 2018
1 parent 49113e9 commit edd4c36
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions master.cfg
Original file line number Diff line number Diff line change
@@ -90,15 +90,17 @@ def nextSlave(builder, slave_builders):

return min(slave_builders, key=busyRatio)

conda_env_name = 'buildbot-%(buildername)s-%(buildnumber)s'
conda_env_name = 'buildbot-%(buildername)s-%(buildnumber)s' # also see below

def condaEnv(use_local=False, extra_vars={}):
@renderer
def extendPath(props):
builddir = props.getProperty("builddir")

if use_local:
env_root = [builddir, "..", "miniconda", "envs", conda_env_name]
env_root = [builddir, "..", "miniconda", "envs",
"buildbot-" + props.getProperty("buildername") +
"-" + props.getProperty("buildnumber")]
else:
env_root = [builddir, "..", "miniconda"]

0 comments on commit edd4c36

Please sign in to comment.