Commit 0d8fc05c authored by Valentin Reis's avatar Valentin Reis
Browse files

Adds "performance" tag so that KVM chameleon machines do not run

TestPerfwrapper.
parent 5aa44127
Pipeline #5432 passed with stages
in 1 minute and 23 seconds
No preview for this file type
...@@ -6,7 +6,7 @@ let ...@@ -6,7 +6,7 @@ let
argopkgs = import ../pkgs {}; argopkgs = import ../pkgs {};
hydraSrc = builtins.fetchTarball https://github.com/nixos/hydra/archive/master.tar.gz; hydraSrc = builtins.fetchTarball https://github.com/nixos/hydra/archive/master.tar.gz;
argomodules = import ../modules/module-list.nix; argomodules = import ../modules/module-list.nix;
mkChameleonRunner = ip: mkChameleonRunner = ip: name:
{ ... }: { ... }:
{ {
deployment.targetEnv = "none"; deployment.targetEnv = "none";
...@@ -71,6 +71,7 @@ let ...@@ -71,6 +71,7 @@ let
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
services.gitlab-runner2.enable = true; services.gitlab-runner2.enable = true;
services.gitlab-runner2.name = name;
services.gitlab-runner2.registrationConfigFile = "/run/gitlab.cfg"; services.gitlab-runner2.registrationConfigFile = "/run/gitlab.cfg";
services.gitlab-runner2.packages = [pkgs.bash pkgs.docker-machine pkgs.shadow pkgs.git]; services.gitlab-runner2.packages = [pkgs.bash pkgs.docker-machine pkgs.shadow pkgs.git];
...@@ -88,10 +89,10 @@ in ...@@ -88,10 +89,10 @@ in
network.description = "argo-ci"; network.description = "argo-ci";
network.enableRollback = false; network.enableRollback = false;
gitlab-runner-4 = mkChameleonRunner "129.114.111.114"; gitlab-runner-4 = mkChameleonRunner "129.114.111.114" "chameleon-129.114.111.114";
gitlab-runner-3 = mkChameleonRunner "129.114.110.3"; gitlab-runner-3 = mkChameleonRunner "129.114.110.3" "chameleon-129.114.110.3";
gitlab-runner-2 = mkChameleonRunner "129.114.111.116"; gitlab-runner-2 = mkChameleonRunner "129.114.111.116" "chameleon-129.114.111.116";
gitlab-runner-1 = mkChameleonRunner "129.114.33.201"; gitlab-runner-1 = mkChameleonRunner "129.114.33.201" "chameleon-129.114.33.201";
slave-desktop = slave-desktop =
{ ... }: { ... }:
......
...@@ -36,6 +36,13 @@ in ...@@ -36,6 +36,13 @@ in
''; '';
}; };
name = mkOption {
default = "gitlab-runner";
type = types.str;
example = "my-gitlab-runner";
description = ''Gitlab runner name.'';
};
gracefulTimeout = mkOption { gracefulTimeout = mkOption {
default = "infinity"; default = "infinity";
type = types.str; type = types.str;
...@@ -78,7 +85,7 @@ in ...@@ -78,7 +85,7 @@ in
EnvironmentFile = "${cfg.registrationConfigFile}"; EnvironmentFile = "${cfg.registrationConfigFile}";
ExecStartPre = ''${cfg.package.bin}/bin/gitlab-runner register \ ExecStartPre = ''${cfg.package.bin}/bin/gitlab-runner register \
--non-interactive=true \ --non-interactive=true \
--name gitlab-runner \ --name ${cfg.name} \
--executor "shell" \ --executor "shell" \
--tag-list "integration" \ --tag-list "integration" \
''; '';
...@@ -88,7 +95,7 @@ in ...@@ -88,7 +95,7 @@ in
''; '';
#--user gitlab-runner \ #--user gitlab-runner \
ExecStopPost = ''${cfg.package.bin}/bin/gitlab-runner unregister \ ExecStopPost = ''${cfg.package.bin}/bin/gitlab-runner unregister \
--name gitlab-runner --name ${cfg.name}
''; '';
} // optionalAttrs (cfg.gracefulTermination) { } // optionalAttrs (cfg.gracefulTermination) {
......
...@@ -23,6 +23,9 @@ testPerfwrapper: ...@@ -23,6 +23,9 @@ testPerfwrapper:
extends: .test extends: .test
script: script:
- "argonix build testPerfwrapper --argopkgs $ARGOPKGS $EXTRA --verbose" - "argonix build testPerfwrapper --argopkgs $ARGOPKGS $EXTRA --verbose"
tags:
- performance
- integration
testPower: testPower:
extends: .test extends: .test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment