summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml5
-rw-r--r--krebs/2configs/shack/gitlab-runner.nix3
2 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f893331b4..b5e92d084 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,9 +30,12 @@ nix-shell test:
wolf deployment:
stage: deploy
script:
- - GIT_SSH_COMMAND="ssh -i ~/.ssh/gitlab_deploy.key" git clone git@ssh.git.shackspace.de:rz/secrets.git ~/brain
+ - cp ~/.ssh/gitlab_deploy.key ~/.ssh/id_rsa
+ - git clone git@ssh.git.shackspace.de:rz/secrets.git ~/brain
- git submodule update --init
- ssh-keyscan -H 'wolf.shack' >> ~/.ssh/known_hosts
+ - ssh-keyscan -H 'wolf' >> ~/.ssh/known_hosts
+ - ssh wolf uname -a
# TODO, hostname wolf cannot be resolved
- $(nix-build krebs/krops.nix --no-out-link --argstr name wolf --argstr target wolf.shack -A deploy)
nur-packages makefu:
diff --git a/krebs/2configs/shack/gitlab-runner.nix b/krebs/2configs/shack/gitlab-runner.nix
index f1bb94f37..501dc47ea 100644
--- a/krebs/2configs/shack/gitlab-runner.nix
+++ b/krebs/2configs/shack/gitlab-runner.nix
@@ -19,6 +19,7 @@ in
# CI_SERVER_URL=<CI server URL>
# REGISTRATION_TOKEN=<registration secret>
registrationConfigFile = <secrets/shackspace-gitlab-ci>;
- gracefulTermination = true;
+ #gracefulTermination = true;
};
+ systemd.services.gitlab-runner2.restartIfChanged = false;
}