From a9952f0093b6316c87eb64083c09363ca95dba43 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Wed, 3 Nov 2021 11:41:53 +0100
Subject: [PATCH] Revert "nixos/tests/elk: remove OSS ELK-7 test"

This reverts commit 35db6bc5543d352ea7e54375ba12acd70033a7f9.
---
 nixos/tests/elk.nix | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/elk.nix b/nixos/tests/elk.nix
index f0ec06195a72..7225ae1f823d 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,13 +233,20 @@ in pkgs.lib.mapAttrs mkElkTest ({
       journalbeat   = pkgs.journalbeat6;
       metricbeat    = pkgs.metricbeat6;
     };
-} // pkgs.lib.optionalAttrs enableUnfree {
-    ELK-7 =
-      {
-        elasticsearch = pkgs.elasticsearch7;
-        logstash      = pkgs.logstash7;
-        kibana        = pkgs.kibana7;
-        journalbeat   = pkgs.journalbeat7;
-        metricbeat    = pkgs.metricbeat7;
-      };
-})
+  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;
+    };
+}