l 2 buildbot: use make for fast-tests
This commit is contained in:
parent
3b2b4bdfb9
commit
c1957eb83f
@ -66,6 +66,11 @@ in {
|
|||||||
"NIX_REMOTE": "daemon",
|
"NIX_REMOTE": "daemon",
|
||||||
"dummy_secrets": "true",
|
"dummy_secrets": "true",
|
||||||
}
|
}
|
||||||
|
env_shared = {
|
||||||
|
"LOGNAME": "shared",
|
||||||
|
"NIX_REMOTE": "daemon",
|
||||||
|
"dummy_secrets": "true",
|
||||||
|
}
|
||||||
|
|
||||||
# prepare nix-shell
|
# prepare nix-shell
|
||||||
# the dependencies which are used by the test script
|
# the dependencies which are used by the test script
|
||||||
@ -114,19 +119,35 @@ in {
|
|||||||
fast-tests = ''
|
fast-tests = ''
|
||||||
f = util.BuildFactory()
|
f = util.BuildFactory()
|
||||||
f.addStep(grab_repo)
|
f.addStep(grab_repo)
|
||||||
for i in [ "prism", "mors", "echelon" ]:
|
for i in [ "mors", "uriel", "shodan", "helios", "cloudkrebs", "echelon", "dishfire", "prism" ]:
|
||||||
addShell(f,name="populate-{}".format(i),env=env_lass,
|
addShell(f,name="build-{}".format(i),env=env_lass,
|
||||||
command=nixshell + \
|
command=nixshell + \
|
||||||
["{}(make system={} populate debug=true)".format("!" if "failing" in i else "",i)])
|
["make \
|
||||||
|
test \
|
||||||
|
ssh=${sshWrapper} \
|
||||||
|
target=build@localhost${config.users.users.build.home}/testbuild \
|
||||||
|
method=eval \
|
||||||
|
system={}".format(i)])
|
||||||
|
|
||||||
addShell(f,name="build-test-minimal",env=env_lass,
|
for i in [ "x", "wry", "vbob", "wbob", "shoney" ]:
|
||||||
|
addShell(f,name="build-{}".format(i),env=env_makefu,
|
||||||
command=nixshell + \
|
command=nixshell + \
|
||||||
["nix-instantiate \
|
["make \
|
||||||
--show-trace --eval --strict --json \
|
test \
|
||||||
-I nixos-config=./shared/1systems/test-minimal-deploy.nix \
|
ssh=${sshWrapper} \
|
||||||
-I secrets=. \
|
target=build@localhost${config.users.users.build.home}/testbuild \
|
||||||
-A config.system.build.toplevel"]
|
method=eval \
|
||||||
)
|
system={}".format(i)])
|
||||||
|
|
||||||
|
for i in [ "test-minimal-deploy" ]:
|
||||||
|
addShell(f,name="build-{}".format(i),env=env_shared,
|
||||||
|
command=nixshell + \
|
||||||
|
["make \
|
||||||
|
test \
|
||||||
|
ssh=${sshWrapper} \
|
||||||
|
target=build@localhost${config.users.users.build.home}/testbuild \
|
||||||
|
method=eval \
|
||||||
|
system={}".format(i)])
|
||||||
|
|
||||||
bu.append(util.BuilderConfig(name="fast-tests",
|
bu.append(util.BuilderConfig(name="fast-tests",
|
||||||
slavenames=slavenames,
|
slavenames=slavenames,
|
||||||
|
Loading…
Reference in New Issue
Block a user