From 58c32bcc0a085a245203dc30f3330c3e1dfb335a Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 20 Dec 2015 21:07:37 +0100
Subject: cac: 1.0."0" -> 1.0.2

---
 krebs/5pkgs/cac/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix
index 40dd56412..5e48cce74 100644
--- a/krebs/5pkgs/cac/default.nix
+++ b/krebs/5pkgs/cac/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, coreutils, curl, gnused, inotifyTools, jq, ncurses, sshpass, ... }:
 
 stdenv.mkDerivation {
-  name = "cac-1.0.0";
+  name = "cac-1.0.2";
 
   src = fetchgit {
-    url = http://cgit.gum/cac;
-    rev = "fe3b2ecb0aaf7d863842b896e18cd2b829f2297b";
-    sha256 = "05bnd7wyjhqy8srmpnc8d234rv3jxdjgb4z0hlfb9kg7mb12w1ya";
+    url = http://cgit.cd.retiolum/cac;
+    rev = "3d6aef3631aa2e0becba447ed9c36a268dcf8bb5";
+    sha256 = "4f584ef8d53a003818ec6608d2cccda42fc7806cd6f9fa9ad179346f3f59744c";
   };
 
   phases = [
@@ -29,10 +29,7 @@ stdenv.mkDerivation {
     ''
       mkdir -p $out/bin
 
-      sed \
-        's,^\(  true) \)\(cac "$@";;\)$,\1 PATH=${path}${PATH+:$PATH} \2,' \
-        < ./cac \
-        > $out/bin/cac
+      sed 's;^_main .*;PATH=${path} &;' < ./cac > $out/bin/cac
 
       chmod +x $out/bin/cac
     '';
-- 
cgit v1.2.3


From 9d88191a70e0b8b4c050329a58a0922c8d075822 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 20 Dec 2015 21:13:54 +0100
Subject: cac: 1.0.2 -> 1.0.3

---
 krebs/5pkgs/cac/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/cac/default.nix b/krebs/5pkgs/cac/default.nix
index 5e48cce74..4d39ce2fb 100644
--- a/krebs/5pkgs/cac/default.nix
+++ b/krebs/5pkgs/cac/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchgit, coreutils, curl, gnused, inotifyTools, jq, ncurses, sshpass, ... }:
+{ stdenv, fetchgit, bc, coreutils, curl, gnused, inotifyTools, jq, ncurses, sshpass, ... }:
 
 stdenv.mkDerivation {
-  name = "cac-1.0.2";
+  name = "cac-1.0.3";
 
   src = fetchgit {
     url = http://cgit.cd.retiolum/cac;
-    rev = "3d6aef3631aa2e0becba447ed9c36a268dcf8bb5";
-    sha256 = "4f584ef8d53a003818ec6608d2cccda42fc7806cd6f9fa9ad179346f3f59744c";
+    rev = "22acc1b990ac7d97c16344fbcbc2621e24cdf915";
+    sha256 = "135b740617c983b3f46a1983d4744be17340d5146a0a0de0dff4bb7a53688f2f";
   };
 
   phases = [
@@ -17,6 +17,7 @@ stdenv.mkDerivation {
   installPhase =
     let
       path = stdenv.lib.makeSearchPath "bin" [
+        bc
         coreutils
         curl
         gnused
@@ -29,7 +30,9 @@ stdenv.mkDerivation {
     ''
       mkdir -p $out/bin
 
-      sed 's;^_main .*;PATH=${path} &;' < ./cac > $out/bin/cac
+      sed < ./cac > $out/bin/cac '
+        s;^_cac_main .*;PATH=${path}''${PATH+:$PATH} &;
+      '
 
       chmod +x $out/bin/cac
     '';
-- 
cgit v1.2.3


From e6b1003fe26e340be21a12e6e531259fd698f33f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 16:30:23 +0100
Subject: k 5 krebs-ci: initial commit

---
 krebs/5pkgs/krebs-ci/default.nix |  37 +++++++++++++
 krebs/5pkgs/krebs-ci/notes       | 111 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 krebs/5pkgs/krebs-ci/default.nix
 create mode 100755 krebs/5pkgs/krebs-ci/notes

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/krebs-ci/default.nix b/krebs/5pkgs/krebs-ci/default.nix
new file mode 100644
index 000000000..f5b302b52
--- /dev/null
+++ b/krebs/5pkgs/krebs-ci/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, coreutils,makeWrapper, cac, cacpanel, gnumake, gnused, jq, openssh, ... }:
+
+stdenv.mkDerivation rec {
+  name = "krebs-ci-0.1.0";
+
+  src = ./notes;
+
+  phases = [
+    "installPhase"
+  ];
+  buildInputs = [ makeWrapper ];
+
+  path = stdenv.lib.makeSearchPath "bin" [
+    coreutils
+    cac
+    cacpanel
+    gnumake
+    gnused
+    jq
+    openssh
+  ];
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp ${src} $out/bin/krebs-ci
+      chmod +x $out/bin/krebs-ci
+      wrapProgram $out/bin/krebs-ci \
+              --prefix PATH : ${path}
+    '';
+  meta = with stdenv.lib; {
+    homepage = http://krebsco.de;
+    description = "Krebs CI Scripts";
+    license = licenses.wtfpl;
+    maintainers = [ maintainers.makefu ];
+  };
+}
diff --git a/krebs/5pkgs/krebs-ci/notes b/krebs/5pkgs/krebs-ci/notes
new file mode 100755
index 000000000..7e34d6a28
--- /dev/null
+++ b/krebs/5pkgs/krebs-ci/notes
@@ -0,0 +1,111 @@
+#! /bin/sh
+
+# nix-shell -p gnumake jq openssh cac cacpanel
+set -euf
+
+# 2 secrets are required:
+krebs_cred=${krebs_cred-./cac.json}
+retiolum_key=${retiolum_key-./retiolum.rsa_key.priv}
+
+# Sanity
+if test ! -r "$krebs_cred";then
+  echo "\$krebs_cred=$krebs_cred must be readable"; exit 1
+fi
+if test ! -r "$retiolum_key";then
+  echo "\$retiolum_key=$retiolum_key must be readable"; exit 1
+fi
+
+krebs_secrets=$(mktemp -d)
+sec_file=$krebs_secrets/cac_config
+krebs_ssh=$krebs_secrets/tempssh
+# we need to receive this key from buildmaster to speed up tinc bootstrap
+TRAP="rm $sec_file;rm -r $krebs_secrets"
+trap "$TRAP" INT TERM EXIT
+
+cat > $sec_file <<EOF
+cac_login="$(jq -r .email $krebs_cred)"
+cac_key="$(cac-cli panel --config $krebs_cred settings | jq -r .apicode)"
+EOF
+
+export cac_secrets=$sec_file
+cac-cli panel --config $krebs_cred update-api-ip
+
+# test login:
+cac update
+cac servers
+
+# Template 26: CentOS7
+# TODO: use cac templates to determine the real Centos7 template in case it changes
+name=$( cac build cpu=1 ram=512 storage=10 os=26 2>&1\
+  | jq -r .servername)
+
+id=servername:$name
+trap "cac delete $id;$TRAP" INT TERM EXIT
+# TODO: timeout?
+always_update=true cac waitstatus $id "Powered On"
+
+wait_login_cac(){
+  # timeout
+  for t in `seq 60`;do
+    # now we have a working cac server
+    if cac ssh $1 cat /etc/redhat-release | \
+      grep CentOS ;then
+      return 0
+    fi
+    sleep 10
+  done
+  return 1
+}
+# die on timeout
+wait_login_cac $id
+
+mkdir -p shared/2configs/temp
+cac generatenetworking $id > \
+  shared/2configs/temp/networking.nix
+# new temporary ssh key we will use to log in after infest
+ssh-keygen -f $krebs_ssh -N ""
+cp $retiolum_key $krebs_secrets/retiolum.rsa_key.priv
+# we override the directories for secrets and stockholm
+# additionally we set the ssh key we generated
+ip=$(cac getserver $id | jq -r .ip)
+
+cat > shared/2configs/temp/dirs.nix <<EOF
+_: {
+  krebs.build.source.dir = {
+    secrets.path = "$krebs_secrets";
+    stockholm.path = "$(pwd)";
+  };
+  users.extraUsers.root.openssh.authorizedKeys.keys = [
+    "$(cat ${krebs_ssh}.pub)"
+  ];
+  krebs.build.target = "$ip";
+}
+EOF
+
+LOGNAME=shared make eval get=krebs.infest \
+  target=derp system=test-centos7 filter=json \
+  | sed -e "s#^ssh.*<<#cac ssh $id<<#" \
+        -e "/^rsync/a -e 'cac ssh $id' \\\\"  \
+        -e "s#root.derp:#:#" > $krebs_secrets/infest
+sh -x $krebs_secrets/infest
+
+# TODO: generate secrets directory $krebs_secrets for nix import
+cac powerop $id reset
+
+wait_login(){
+  # timeout
+  for t in `seq 20`;do
+    # now we have a working cac server
+    if ssh -o StrictHostKeyChecking=no \
+           -o UserKnownHostsFile=/dev/null \
+           -i $krebs_ssh \
+           -o ConnectTimeout=10 \
+           -o BatchMode=yes \
+           root@$1 nixos-version ;then
+      return 0
+    fi
+    sleep 10
+  done
+  return 1
+}
+wait_login $ip
-- 
cgit v1.2.3


From 56e8346faa75fc42f65d11ea3569a3e5bdd252ec Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 20:53:11 +0100
Subject: k 5 krebs-ci: remove obsolete trap rm

---
 krebs/5pkgs/krebs-ci/notes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/krebs-ci/notes b/krebs/5pkgs/krebs-ci/notes
index 7e34d6a28..f6b193ddb 100755
--- a/krebs/5pkgs/krebs-ci/notes
+++ b/krebs/5pkgs/krebs-ci/notes
@@ -19,7 +19,7 @@ krebs_secrets=$(mktemp -d)
 sec_file=$krebs_secrets/cac_config
 krebs_ssh=$krebs_secrets/tempssh
 # we need to receive this key from buildmaster to speed up tinc bootstrap
-TRAP="rm $sec_file;rm -r $krebs_secrets"
+TRAP="rm -r $krebs_secrets"
 trap "$TRAP" INT TERM EXIT
 
 cat > $sec_file <<EOF
-- 
cgit v1.2.3


From 1a184c98a21ed32447bb4a88f7c865adef5a535f Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 22 Dec 2015 23:37:12 +0100
Subject: k 5 krebs-ci: set cache files manually

---
 krebs/5pkgs/krebs-ci/notes | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/krebs-ci/notes b/krebs/5pkgs/krebs-ci/notes
index f6b193ddb..f6f3da8db 100755
--- a/krebs/5pkgs/krebs-ci/notes
+++ b/krebs/5pkgs/krebs-ci/notes
@@ -1,9 +1,10 @@
 #! /bin/sh
 
 # nix-shell -p gnumake jq openssh cac cacpanel
-set -euf
+set -eufx
 
 # 2 secrets are required:
+
 krebs_cred=${krebs_cred-./cac.json}
 retiolum_key=${retiolum_key-./retiolum.rsa_key.priv}
 
@@ -18,8 +19,12 @@ fi
 krebs_secrets=$(mktemp -d)
 sec_file=$krebs_secrets/cac_config
 krebs_ssh=$krebs_secrets/tempssh
+cac_resources_cache=$krebs_secrets/res_cache.json
+cac_servers_cache=$krebs_secrets/servers_cache.json
+cac_tasks_cache=$krebs_secrets/tasks_cache.json
+cac_templates_cache=$krebs_secrets/templates_cache.json
 # we need to receive this key from buildmaster to speed up tinc bootstrap
-TRAP="rm -r $krebs_secrets"
+TRAP="rm -r $krebs_secrets;exit"
 trap "$TRAP" INT TERM EXIT
 
 cat > $sec_file <<EOF
@@ -42,11 +47,11 @@ name=$( cac build cpu=1 ram=512 storage=10 os=26 2>&1\
 id=servername:$name
 trap "cac delete $id;$TRAP" INT TERM EXIT
 # TODO: timeout?
-always_update=true cac waitstatus $id "Powered On"
+# cac_always_update=true cac waitstatus $id "Powered On"
 
 wait_login_cac(){
   # timeout
-  for t in `seq 60`;do
+  for t in `seq 180`;do
     # now we have a working cac server
     if cac ssh $1 cat /etc/redhat-release | \
       grep CentOS ;then
-- 
cgit v1.2.3


From dc8e270d2a5346e4316b7c2050b26fd428ec3fc3 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 23 Dec 2015 00:06:27 +0100
Subject: m 3 buildbot: add new slow factory to complete integration test

---
 krebs/5pkgs/krebs-ci/notes | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/krebs-ci/notes b/krebs/5pkgs/krebs-ci/notes
index f6f3da8db..f162656f7 100755
--- a/krebs/5pkgs/krebs-ci/notes
+++ b/krebs/5pkgs/krebs-ci/notes
@@ -19,10 +19,10 @@ fi
 krebs_secrets=$(mktemp -d)
 sec_file=$krebs_secrets/cac_config
 krebs_ssh=$krebs_secrets/tempssh
-cac_resources_cache=$krebs_secrets/res_cache.json
-cac_servers_cache=$krebs_secrets/servers_cache.json
-cac_tasks_cache=$krebs_secrets/tasks_cache.json
-cac_templates_cache=$krebs_secrets/templates_cache.json
+export cac_resources_cache=$krebs_secrets/res_cache.json
+export cac_servers_cache=$krebs_secrets/servers_cache.json
+export cac_tasks_cache=$krebs_secrets/tasks_cache.json
+export cac_templates_cache=$krebs_secrets/templates_cache.json
 # we need to receive this key from buildmaster to speed up tinc bootstrap
 TRAP="rm -r $krebs_secrets;exit"
 trap "$TRAP" INT TERM EXIT
-- 
cgit v1.2.3


From 14ddb767eb10dbe43d3112c4b4674f6c1d4ff32a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 23 Dec 2015 11:18:00 +0100
Subject: k 5 mv krebs-ci test/infest-cac-centos7

---
 krebs/5pkgs/default.nix                         |   4 +
 krebs/5pkgs/krebs-ci/default.nix                |  37 --------
 krebs/5pkgs/krebs-ci/notes                      | 116 -----------------------
 krebs/5pkgs/test/infest-cac-centos7/default.nix |  39 ++++++++
 krebs/5pkgs/test/infest-cac-centos7/notes       | 117 ++++++++++++++++++++++++
 5 files changed, 160 insertions(+), 153 deletions(-)
 delete mode 100644 krebs/5pkgs/krebs-ci/default.nix
 delete mode 100755 krebs/5pkgs/krebs-ci/notes
 create mode 100644 krebs/5pkgs/test/infest-cac-centos7/default.nix
 create mode 100755 krebs/5pkgs/test/infest-cac-centos7/notes

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/default.nix b/krebs/5pkgs/default.nix
index 7df7b7d3c..0562fe836 100644
--- a/krebs/5pkgs/default.nix
+++ b/krebs/5pkgs/default.nix
@@ -40,6 +40,10 @@ subdirs // rec {
       }
     '';
 
+  test = {
+    infest-cac-centos7 = pkgs.callPackage ./test/infest-cac-centos7 {};
+  };
+
   execveBin = name: cfg: execve name (cfg // { destination = "/bin/${name}"; });
 
   writeC = name: { destination ? "" }: src: pkgs.runCommand name {} ''
diff --git a/krebs/5pkgs/krebs-ci/default.nix b/krebs/5pkgs/krebs-ci/default.nix
deleted file mode 100644
index f5b302b52..000000000
--- a/krebs/5pkgs/krebs-ci/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, coreutils,makeWrapper, cac, cacpanel, gnumake, gnused, jq, openssh, ... }:
-
-stdenv.mkDerivation rec {
-  name = "krebs-ci-0.1.0";
-
-  src = ./notes;
-
-  phases = [
-    "installPhase"
-  ];
-  buildInputs = [ makeWrapper ];
-
-  path = stdenv.lib.makeSearchPath "bin" [
-    coreutils
-    cac
-    cacpanel
-    gnumake
-    gnused
-    jq
-    openssh
-  ];
-
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      cp ${src} $out/bin/krebs-ci
-      chmod +x $out/bin/krebs-ci
-      wrapProgram $out/bin/krebs-ci \
-              --prefix PATH : ${path}
-    '';
-  meta = with stdenv.lib; {
-    homepage = http://krebsco.de;
-    description = "Krebs CI Scripts";
-    license = licenses.wtfpl;
-    maintainers = [ maintainers.makefu ];
-  };
-}
diff --git a/krebs/5pkgs/krebs-ci/notes b/krebs/5pkgs/krebs-ci/notes
deleted file mode 100755
index f162656f7..000000000
--- a/krebs/5pkgs/krebs-ci/notes
+++ /dev/null
@@ -1,116 +0,0 @@
-#! /bin/sh
-
-# nix-shell -p gnumake jq openssh cac cacpanel
-set -eufx
-
-# 2 secrets are required:
-
-krebs_cred=${krebs_cred-./cac.json}
-retiolum_key=${retiolum_key-./retiolum.rsa_key.priv}
-
-# Sanity
-if test ! -r "$krebs_cred";then
-  echo "\$krebs_cred=$krebs_cred must be readable"; exit 1
-fi
-if test ! -r "$retiolum_key";then
-  echo "\$retiolum_key=$retiolum_key must be readable"; exit 1
-fi
-
-krebs_secrets=$(mktemp -d)
-sec_file=$krebs_secrets/cac_config
-krebs_ssh=$krebs_secrets/tempssh
-export cac_resources_cache=$krebs_secrets/res_cache.json
-export cac_servers_cache=$krebs_secrets/servers_cache.json
-export cac_tasks_cache=$krebs_secrets/tasks_cache.json
-export cac_templates_cache=$krebs_secrets/templates_cache.json
-# we need to receive this key from buildmaster to speed up tinc bootstrap
-TRAP="rm -r $krebs_secrets;exit"
-trap "$TRAP" INT TERM EXIT
-
-cat > $sec_file <<EOF
-cac_login="$(jq -r .email $krebs_cred)"
-cac_key="$(cac-cli panel --config $krebs_cred settings | jq -r .apicode)"
-EOF
-
-export cac_secrets=$sec_file
-cac-cli panel --config $krebs_cred update-api-ip
-
-# test login:
-cac update
-cac servers
-
-# Template 26: CentOS7
-# TODO: use cac templates to determine the real Centos7 template in case it changes
-name=$( cac build cpu=1 ram=512 storage=10 os=26 2>&1\
-  | jq -r .servername)
-
-id=servername:$name
-trap "cac delete $id;$TRAP" INT TERM EXIT
-# TODO: timeout?
-# cac_always_update=true cac waitstatus $id "Powered On"
-
-wait_login_cac(){
-  # timeout
-  for t in `seq 180`;do
-    # now we have a working cac server
-    if cac ssh $1 cat /etc/redhat-release | \
-      grep CentOS ;then
-      return 0
-    fi
-    sleep 10
-  done
-  return 1
-}
-# die on timeout
-wait_login_cac $id
-
-mkdir -p shared/2configs/temp
-cac generatenetworking $id > \
-  shared/2configs/temp/networking.nix
-# new temporary ssh key we will use to log in after infest
-ssh-keygen -f $krebs_ssh -N ""
-cp $retiolum_key $krebs_secrets/retiolum.rsa_key.priv
-# we override the directories for secrets and stockholm
-# additionally we set the ssh key we generated
-ip=$(cac getserver $id | jq -r .ip)
-
-cat > shared/2configs/temp/dirs.nix <<EOF
-_: {
-  krebs.build.source.dir = {
-    secrets.path = "$krebs_secrets";
-    stockholm.path = "$(pwd)";
-  };
-  users.extraUsers.root.openssh.authorizedKeys.keys = [
-    "$(cat ${krebs_ssh}.pub)"
-  ];
-  krebs.build.target = "$ip";
-}
-EOF
-
-LOGNAME=shared make eval get=krebs.infest \
-  target=derp system=test-centos7 filter=json \
-  | sed -e "s#^ssh.*<<#cac ssh $id<<#" \
-        -e "/^rsync/a -e 'cac ssh $id' \\\\"  \
-        -e "s#root.derp:#:#" > $krebs_secrets/infest
-sh -x $krebs_secrets/infest
-
-# TODO: generate secrets directory $krebs_secrets for nix import
-cac powerop $id reset
-
-wait_login(){
-  # timeout
-  for t in `seq 20`;do
-    # now we have a working cac server
-    if ssh -o StrictHostKeyChecking=no \
-           -o UserKnownHostsFile=/dev/null \
-           -i $krebs_ssh \
-           -o ConnectTimeout=10 \
-           -o BatchMode=yes \
-           root@$1 nixos-version ;then
-      return 0
-    fi
-    sleep 10
-  done
-  return 1
-}
-wait_login $ip
diff --git a/krebs/5pkgs/test/infest-cac-centos7/default.nix b/krebs/5pkgs/test/infest-cac-centos7/default.nix
new file mode 100644
index 000000000..7f2e3f231
--- /dev/null
+++ b/krebs/5pkgs/test/infest-cac-centos7/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, coreutils,makeWrapper, cac, cacpanel, gnumake, gnused, jq, openssh, ... }:
+
+stdenv.mkDerivation rec {
+  name = "${shortname}-${version}";
+  shortname = "infest-cac-centos7";
+  version = "0.2.0";
+
+  src = ./notes;
+
+  phases = [
+    "installPhase"
+  ];
+  buildInputs = [ makeWrapper ];
+
+  path = stdenv.lib.makeSearchPath "bin" [
+    coreutils
+    cac
+    cacpanel
+    gnumake
+    gnused
+    jq
+    openssh
+  ];
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp ${src} $out/bin/${shortname}
+      chmod +x $out/bin/${shortname}
+      wrapProgram $out/bin/${shortname} \
+              --prefix PATH : ${path}
+    '';
+  meta = with stdenv.lib; {
+    homepage = http://krebsco.de;
+    description = "Krebs CI Scripts";
+    license = licenses.wtfpl;
+    maintainers = [ maintainers.makefu ];
+  };
+}
diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes
new file mode 100755
index 000000000..1e350084c
--- /dev/null
+++ b/krebs/5pkgs/test/infest-cac-centos7/notes
@@ -0,0 +1,117 @@
+#! /bin/sh
+
+# nix-shell -p gnumake jq openssh cac cacpanel
+set -eufx
+
+# 2 secrets are required:
+
+krebs_cred=${krebs_cred-./cac.json}
+retiolum_key=${retiolum_key-./retiolum.rsa_key.priv}
+
+# Sanity
+if test ! -r "$krebs_cred";then
+  echo "\$krebs_cred=$krebs_cred must be readable"; exit 1
+fi
+if test ! -r "$retiolum_key";then
+  echo "\$retiolum_key=$retiolum_key must be readable"; exit 1
+fi
+
+krebs_secrets=$(mktemp -d)
+sec_file=$krebs_secrets/cac_config
+krebs_ssh=$krebs_secrets/tempssh
+export cac_resources_cache=$krebs_secrets/res_cache.json
+export cac_servers_cache=$krebs_secrets/servers_cache.json
+export cac_tasks_cache=$krebs_secrets/tasks_cache.json
+export cac_templates_cache=$krebs_secrets/templates_cache.json
+# we need to receive this key from buildmaster to speed up tinc bootstrap
+TRAP="rm -r $krebs_secrets;trap - INT TERM EXIT"
+trap "$TRAP" INT TERM EXIT
+
+cat > $sec_file <<EOF
+cac_login="$(jq -r .email $krebs_cred)"
+cac_key="$(cac-cli panel --config $krebs_cred settings | jq -r .apicode)"
+EOF
+
+export cac_secrets=$sec_file
+cac-cli panel --config $krebs_cred update-api-ip
+
+# test login:
+cac update
+cac servers
+
+# Template 26: CentOS7
+# TODO: use cac templates to determine the real Centos7 template in case it changes
+name=$( cac build cpu=1 ram=512 storage=10 os=26 2>&1\
+  | jq -r .servername)
+
+id=servername:$name
+trap "cac delete $id;$TRAP;exit" INT TERM EXIT
+# TODO: timeout?
+
+wait_login_cac(){
+  # timeout
+  for t in `seq 180`;do
+    # now we have a working cac server
+    if cac ssh $1 -o ConnectTimeout=10 \
+                  -o BatchMode=yes \
+                  cat /etc/redhat-release | \
+                    grep CentOS ;then
+      return 0
+    fi
+    sleep 10
+  done
+  return 1
+}
+# die on timeout
+wait_login_cac $id
+
+mkdir -p shared/2configs/temp
+cac generatenetworking $id > \
+  shared/2configs/temp/networking.nix
+# new temporary ssh key we will use to log in after infest
+ssh-keygen -f $krebs_ssh -N ""
+cp $retiolum_key $krebs_secrets/retiolum.rsa_key.priv
+# we override the directories for secrets and stockholm
+# additionally we set the ssh key we generated
+ip=$(cac getserver $id | jq -r .ip)
+
+cat > shared/2configs/temp/dirs.nix <<EOF
+_: {
+  krebs.build.source.dir = {
+    secrets.path = "$krebs_secrets";
+    stockholm.path = "$(pwd)";
+  };
+  users.extraUsers.root.openssh.authorizedKeys.keys = [
+    "$(cat ${krebs_ssh}.pub)"
+  ];
+  krebs.build.target = "$ip";
+}
+EOF
+
+LOGNAME=shared make eval get=krebs.infest \
+  target=derp system=test-centos7 filter=json \
+  | sed -e "s#^ssh.*<<#cac ssh $id<<#" \
+        -e "/^rsync/a -e 'cac ssh $id' \\\\"  \
+        -e "s#root.derp:#:#" > $krebs_secrets/infest
+sh -x $krebs_secrets/infest
+
+# TODO: generate secrets directory $krebs_secrets for nix import
+cac powerop $id reset
+
+wait_login(){
+  # timeout
+  for t in `seq 20`;do
+    # now we have a working cac server
+    if ssh -o StrictHostKeyChecking=no \
+           -o UserKnownHostsFile=/dev/null \
+           -i $krebs_ssh \
+           -o ConnectTimeout=10 \
+           -o BatchMode=yes \
+           root@$1 nixos-version ;then
+      return 0
+    fi
+    sleep 10
+  done
+  return 1
+}
+wait_login $ip
-- 
cgit v1.2.3


From cf3391704d88c49afba652715e1153888bf46099 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Wed, 23 Dec 2015 16:02:58 +0100
Subject: k 5 test/infest*: remove batch mode from cac ssh call

this leads to "permission denied"
---
 krebs/5pkgs/test/infest-cac-centos7/notes | 1 -
 1 file changed, 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes
index 1e350084c..5fd0cae61 100755
--- a/krebs/5pkgs/test/infest-cac-centos7/notes
+++ b/krebs/5pkgs/test/infest-cac-centos7/notes
@@ -53,7 +53,6 @@ wait_login_cac(){
   for t in `seq 180`;do
     # now we have a working cac server
     if cac ssh $1 -o ConnectTimeout=10 \
-                  -o BatchMode=yes \
                   cat /etc/redhat-release | \
                     grep CentOS ;then
       return 0
-- 
cgit v1.2.3


From 6e4351044195f1f3b5708785e760b9d118e2c229 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 24 Dec 2015 02:20:24 +0100
Subject: k 5 test/infest*: up limit of final connect

---
 krebs/5pkgs/test/infest-cac-centos7/notes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'krebs/5pkgs')

diff --git a/krebs/5pkgs/test/infest-cac-centos7/notes b/krebs/5pkgs/test/infest-cac-centos7/notes
index 5fd0cae61..5bb5de2c4 100755
--- a/krebs/5pkgs/test/infest-cac-centos7/notes
+++ b/krebs/5pkgs/test/infest-cac-centos7/notes
@@ -99,7 +99,7 @@ cac powerop $id reset
 
 wait_login(){
   # timeout
-  for t in `seq 20`;do
+  for t in `seq 90`;do
     # now we have a working cac server
     if ssh -o StrictHostKeyChecking=no \
            -o UserKnownHostsFile=/dev/null \
-- 
cgit v1.2.3