diff options
| author | tv <tv@krebsco.de> | 2016-02-11 23:59:07 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-02-11 23:59:07 +0100 |
| commit | 2b6a54c31c47667495187f9ff8f9a6009a2652ab (patch) | |
| tree | ab00bc10716b73443dbe58d1279ce367e6cc71fc /shared | |
| parent | 8c87356aee561fd8bc50dc2b7029ab30118f0d2c (diff) | |
| parent | e8a0058f8cd654247eb0b08326dd34c3ac9cff6a (diff) | |
Merge remote-tracking branch 'gum/master'
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/2configs/base.nix | 2 | ||||
| -rw-r--r-- | shared/2configs/shared-buildbot.nix | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/shared/2configs/base.nix b/shared/2configs/base.nix index dd698ba97..715397ed5 100644 --- a/shared/2configs/base.nix +++ b/shared/2configs/base.nix @@ -18,7 +18,7 @@ with lib; krebs.build.source = { upstream-nixpkgs = mkDefault { url = https://github.com/NixOS/nixpkgs; - rev = "d0e3cca"; + rev = "77f8f35d57618c1ba456d968524f2fb2c3448295"; # for urlwatch-minidb }; secrets = mkDefault "${getEnv "HOME"}/secrets/krebs/${config.krebs.build.host.name}"; stockholm = mkDefault "${getEnv "HOME"}/stockholm"; diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index 50b279036..af877f5d8 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -12,10 +12,10 @@ testslave = "krebspass"; }; change_source.stockholm = '' - stockholm_repo = 'http://cgit.gum/stockholm' + stockholm_repo = 'http://cgit.wolf/stockholm-mirror' cs.append(changes.GitPoller( stockholm_repo, - workdir='stockholm-poller', branch='master', + workdir='stockholm-poller', branches=True, project='stockholm', pollinterval=120)) ''; @@ -28,7 +28,9 @@ fast-tests-scheduler = '' # test the master real quick sched.append(schedulers.SingleBranchScheduler( - change_filter=util.ChangeFilter(branch="master"), + ## all branches + change_filter=util.ChangeFilter(branch_re=".*"), + # change_filter=util.ChangeFilter(branch="master"), treeStableTimer=10, #only test the latest push name="fast-master-test", builderNames=["fast-tests"])) @@ -52,7 +54,6 @@ }; builder_pre = '' # prepare grab_repo step for stockholm - stockholm_repo = "http://cgit.gum.retiolum/stockholm" grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental') env = {"LOGNAME": "shared", "NIX_REMOTE": "daemon"} @@ -78,8 +79,11 @@ f.addStep(grab_repo) for i in [ "test-centos7", "wolf", "test-failing" ]: addShell(f,name="populate-{}".format(i),env=env, - command=nixshell + ["set -o pipefail;{}( nix-instantiate --arg configuration shared/1systems/{}.nix --eval --readonly-mode --show-trace -A config.krebs.build.populate --strict | jq -r .)".format("!" if "failing" in i else "",i)]) + command=nixshell + \ + ["{}( make system={} eval.config.krebs.build.populate \ + | jq -er .)".format("!" if "failing" in i else "",i)]) + # XXX we must prepare ./retiolum.rsa_key.priv for secrets to work addShell(f,name="instantiate-test-all-modules",env=env, command=nixshell + \ ["touch retiolum.rsa_key.priv; \ |