diff options
| author | makefu <github@syntax-fehler.de> | 2016-03-11 08:52:58 +0100 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-03-11 08:52:58 +0100 |
| commit | 1219465af903c2a6898daf8ed359f5ccf189810b (patch) | |
| tree | 0bb6f478b51d13e14e7b1c189e6c0d3e1c0a0c7a /krebs/5pkgs/test | |
| parent | ce98c6d7a3980e1e81e4ecceaec12d29cd25eb36 (diff) | |
| parent | 8629a9de8bcc98686d10387c02489178183b616d (diff) | |
Merge branch 'master' of gum:stockholm-bare
Diffstat (limited to 'krebs/5pkgs/test')
| -rw-r--r-- | krebs/5pkgs/test/infest-cac-centos7/default.nix | 2 | ||||
| -rwxr-xr-x | krebs/5pkgs/test/infest-cac-centos7/notes | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/krebs/5pkgs/test/infest-cac-centos7/default.nix b/krebs/5pkgs/test/infest-cac-centos7/default.nix index 5dbb4ebd5..9b14bf486 100644 --- a/krebs/5pkgs/test/infest-cac-centos7/default.nix +++ b/krebs/5pkgs/test/infest-cac-centos7/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { name = "${shortname}-${version}"; shortname = "infest-cac-centos7"; - version = "0.2.6"; + version = "0.2.7"; src = ./notes; diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes index fafc11572..ab6bc557c 100755 --- a/krebs/5pkgs/test/infest-cac-centos7/notes +++ b/krebs/5pkgs/test/infest-cac-centos7/notes @@ -16,7 +16,7 @@ krebs_cred=${krebs_cred-./cac.json} retiolum_key=${retiolum_key-./retiolum.rsa_key.priv} # build this host user=${user:-shared} -target=${target_system:-test-centos7} +system=${target_system:-test-centos7} log(){ echo "[$(date +"%Y-%m-%d %T")] $@" 2>&1 @@ -45,8 +45,8 @@ if test ! -r "$retiolum_key";then echo "\$retiolum_key=$retiolum_key must be readable"; exit 1 fi -if test ! -r "${user}/1systems/${target}.nix" ;then - echo "cannot find ${user}/1systems/${target}.nix , not started in stockholm directory?" +if test ! -r "${user}/1systems/${system}.nix" ;then + echo "cannot find ${user}/1systems/${system}.nix , not started in stockholm directory?" exit 1 fi @@ -86,7 +86,7 @@ while true;do id=servername:$name log "got a working machine, id=$id" else - elog "Unable to build a virtual machine, retrying in 15 seconds" + log "Unable to build a virtual machine, retrying in 15 seconds" log "Output of build program: $out" sleep 15 continue @@ -153,7 +153,7 @@ make install \ LOGNAME=${user} \ SSHPASS="$(cac-api getserver $id | jq -r .rootpass)" \ ssh='sshpass -e ssh -S none -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' \ - system=${target} \ + system=${system} \ target=$ip log "finalizing installation" cac-api ssh $id < krebs/4lib/infest/finalize.sh |