diff options
author | Robert Hensing <robert@roberthensing.nl> | 2021-11-03 12:24:41 +0100 |
---|---|---|
committer | Robert Hensing <robert@roberthensing.nl> | 2021-11-03 12:24:41 +0100 |
commit | 15e4c45cc753015cf9dbd6262c30c39d6232db59 (patch) | |
tree | fe99e25dbeaa15fc6fd2ec698bebe62ef2457cb7 /nixos/tests/elk.nix | |
parent | a9952f0093b6316c87eb64083c09363ca95dba43 (diff) |
nixos/tests/elk: Restructure attribute layout to avoid ELK-7 (non-OSS) on Hydra
... or any other tool that respects the recurseForDerivations attribute.
Diffstat (limited to 'nixos/tests/elk.nix')
-rw-r--r-- | nixos/tests/elk.nix | 53 |
1 files changed, 29 insertions, 24 deletions
diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix index 7225ae1f823d7..e37bae7479b4f 100644 --- a/nixos/tests/elk.nix +++ b/nixos/tests/elk.nix @@ -1,12 +1,15 @@ +# To run the test on the unfree ELK use the folllowing command: +# cd path/to/nixpkgs +# NIXPKGS_ALLOW_UNFREE=1 nix-build -A nixosTests.elk.unfree.ELK-6 + { system ? builtins.currentSystem, config ? {}, pkgs ? import ../.. { inherit system config; }, - enableUnfree ? false - # To run the test on the unfree ELK use the folllowing command: - # NIXPKGS_ALLOW_UNFREE=1 nix-build nixos/tests/elk.nix -A ELK-6 --arg enableUnfree true }: let + inherit (pkgs) lib; + esUrl = "http://localhost:9200"; mkElkTest = name : elk : @@ -216,37 +219,39 @@ let ) ''; }) { inherit pkgs system; }; -in pkgs.lib.mapAttrs mkElkTest { - ELK-6 = - if enableUnfree - then { +in { + ELK-6 = mkElkTest { + name = "elk-6-oss"; + elasticsearch = pkgs.elasticsearch6-oss; + logstash = pkgs.logstash6-oss; + kibana = pkgs.kibana6-oss; + journalbeat = pkgs.journalbeat6; + metricbeat = pkgs.metricbeat6; + }; + # We currently only package upstream binaries. + # Feel free to package an SSPL licensed source-based package! + # ELK-7 = mkElkTest { + # name = "elk-7"; + # elasticsearch = pkgs.elasticsearch7-oss; + # logstash = pkgs.logstash7-oss; + # kibana = pkgs.kibana7-oss; + # journalbeat = pkgs.journalbeat7; + # metricbeat = pkgs.metricbeat7; + # }; + unfree = lib.dontRecurseIntoAttrs { + ELK-6 = mkElkTest "elk-6" { elasticsearch = pkgs.elasticsearch6; logstash = pkgs.logstash6; kibana = pkgs.kibana6; journalbeat = pkgs.journalbeat6; metricbeat = pkgs.metricbeat6; - } - else { - elasticsearch = pkgs.elasticsearch6-oss; - logstash = pkgs.logstash6-oss; - kibana = pkgs.kibana6-oss; - journalbeat = pkgs.journalbeat6; - metricbeat = pkgs.metricbeat6; }; - ELK-7 = - if enableUnfree - then { + ELK-7 = mkElkTest "elk-7" { 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; }; + }; } |