diff options
| author | lassulus <lass@aidsballs.de> | 2016-08-05 13:30:27 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-08-05 14:25:48 +0200 |
| commit | d68b340b9b8acb717a6b4d5626600448ba7fd67a (patch) | |
| tree | 1868ac3936108038714e57f6c31ffe74d401877f | |
| parent | e58635b1d2e2f7b6c0b9ff4bebebf7b0d1aab908 (diff) | |
s: add dummy_secrets for tests
| -rw-r--r-- | shared/2configs/default.nix | 5 | ||||
| -rw-r--r-- | shared/2configs/shared-buildbot.nix | 6 | ||||
| -rw-r--r-- | shared/6tests/data/secrets/retiolum.rsa_key.priv | 0 |
3 files changed, 9 insertions, 2 deletions
diff --git a/shared/2configs/default.nix b/shared/2configs/default.nix index 492689427..1c875d24c 100644 --- a/shared/2configs/default.nix +++ b/shared/2configs/default.nix @@ -13,7 +13,10 @@ with config.krebs.lib; url = https://github.com/NixOS/nixpkgs; ref = "63b9785"; # stable @ 2016-06-01 }; - secrets.file = "${getEnv "HOME"}/secrets/krebs/${host.name}"; + secrets.file = + if getEnv "dummy_secrets" == "true" + then toString <stockholm/shared/6tests/data/secrets> + else "${getEnv "HOME"}/secrets/krebs/${host.name}"; stockholm.file = getEnv "PWD"; }; diff --git a/shared/2configs/shared-buildbot.nix b/shared/2configs/shared-buildbot.nix index f1bd701f6..85e3cdf16 100644 --- a/shared/2configs/shared-buildbot.nix +++ b/shared/2configs/shared-buildbot.nix @@ -71,7 +71,11 @@ # prepare grab_repo step for stockholm grab_repo = steps.Git(repourl=stockholm_repo, mode='incremental') - env = {"LOGNAME": "shared", "NIX_REMOTE": "daemon"} + env = { + "LOGNAME": "shared", + "NIX_REMOTE": "daemon", + "dummy_secrets": "true", + } # prepare nix-shell # the dependencies which are used by the test script diff --git a/shared/6tests/data/secrets/retiolum.rsa_key.priv b/shared/6tests/data/secrets/retiolum.rsa_key.priv new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/shared/6tests/data/secrets/retiolum.rsa_key.priv |