diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2021-02-26 20:03:50 +0900 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2021-11-03 11:37:07 +0100 |
| commit | 35db6bc5543d352ea7e54375ba12acd70033a7f9 (patch) | |
| tree | d20eaf44c1ceae1a11f28d64f3351eca27651986 | |
| parent | b7f455600275ef6579d2e47373cab3678a0ceed9 (diff) | |
| download | nixpkgs-35db6bc5543d352ea7e54375ba12acd70033a7f9.tar nixpkgs-35db6bc5543d352ea7e54375ba12acd70033a7f9.tar.gz nixpkgs-35db6bc5543d352ea7e54375ba12acd70033a7f9.tar.bz2 nixpkgs-35db6bc5543d352ea7e54375ba12acd70033a7f9.tar.lz nixpkgs-35db6bc5543d352ea7e54375ba12acd70033a7f9.tar.xz nixpkgs-35db6bc5543d352ea7e54375ba12acd70033a7f9.tar.zst nixpkgs-35db6bc5543d352ea7e54375ba12acd70033a7f9.zip | |
nixos/tests/elk: remove OSS ELK-7 test
| -rw-r--r-- | nixos/tests/elk.nix | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 7225ae1f823..f0ec06195a7 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -216,7 +216,7 @@ let ) ''; }) { inherit pkgs system; }; -in pkgs.lib.mapAttrs mkElkTest { +in pkgs.lib.mapAttrs mkElkTest ({ ELK-6 = if enableUnfree then { @@ -233,20 +233,13 @@ in pkgs.lib.mapAttrs mkElkTest { journalbeat = pkgs.journalbeat6; metricbeat = pkgs.metricbeat6; }; - ELK-7 = - if enableUnfree - then { - elasticsearch = pkgs.elasticsearch7; - logstash = pkgs.logstash7; - kibana = pkgs.kibana7; - journalbeat = pkgs.journalbeat7; - metricbeat = pkgs.metricbeat7; - } - else { - elasticsearch = pkgs.elasticsearch7-oss; - logstash = pkgs.logstash7-oss; - kibana = pkgs.kibana7-oss; - journalbeat = pkgs.journalbeat7; - metricbeat = pkgs.metricbeat7; - }; -} +} // pkgs.lib.optionalAttrs enableUnfree { + ELK-7 = + { + elasticsearch = pkgs.elasticsearch7; + logstash = pkgs.logstash7; + kibana = pkgs.kibana7; + journalbeat = pkgs.journalbeat7; + metricbeat = pkgs.metricbeat7; + }; +}) |