build integrate <version> now accepts a third parameter <clusterfilter> which allows you to run specific cluster integration test more easily e.g build integrate 5.0.1 xpack

Author: Mpdreamz

build.bat

@@ -4,7 +4,7 @@ REM build
 REM build build [skiptests]
 REM build release [version] [skiptests]
 REM build version [version] [skiptests]
-REM build integrate [elasticsearch_versions] [skiptests]
+REM build integrate [elasticsearch_versions] [clustername]
 REM build canary [apikey] [feed] [skiptests]
 
 REM - elasticsearch_versions can be multiple separated with a semi-colon ';'
@@ -24,7 +24,8 @@ SET ESVERSIONS=
 SET SKIPTESTS=0
 SET APIKEY=
 SET APIKEYPROVIDED="<empty>"
-SET FEED="elasticsearch-net"
+SET FEED="elasticsearch-net"
+SET NEST_INTEGRATION_CLUSTER=
 
 IF /I "%1"=="skiptests" (
 	set SKIPTESTS="1"
@@ -46,8 +47,7 @@ IF /I "%1"=="release" (
 
 IF /I "%1%"=="integrate" (
 	IF NOT [%2]==[] (set ESVERSIONS="%2")
-	IF /I "%3"=="skiptests" (set SKIPTESTS=1)
-	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
+	IF NOT [%3]==[] (set NEST_INTEGRATION_CLUSTER="%3")
 )
 
 IF /I "%1%"=="canary" (
@@ -61,5 +61,5 @@ IF /I "%1%"=="canary" (
 	IF /I "%2"=="skiptests" (set SKIPTESTS=1)
 )
 
-ECHO starting build using target=%TARGET% version=%VERSION% esversions=%ESVERSIONS% skiptests=%SKIPTESTS% apiKey=%APIKEYPROVIDED% feed=%FEED%
-"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%" "feed=%FEED%"
+ECHO starting build using target=%TARGET% version=%VERSION% esversions=%ESVERSIONS% skiptests=%SKIPTESTS% apiKey=%APIKEYPROVIDED% feed=%FEED% escluster=%NEST_INTEGRATION_CLUSTER%
+"packages\build\FAKE\tools\Fake.exe" "build\\scripts\\Targets.fsx" "target=%TARGET%" "version=%VERSION%" "esversions=%ESVERSIONS%" "skiptests=%SKIPTESTS%" "apiKey=%APIKEY%" "feed=%FEED%" "escluster=%NEST_INTEGRATION_CLUSTER%"

build/scripts/Targets.fsx

@@ -35,7 +35,7 @@ Target "TestForever"  <| fun _ -> Tests.RunUnitTestsForever()
 
 Target "QuickTest"  <| fun _ -> Tests.RunUnitTests()
 
-Target "Integrate"  <| fun _ -> Tests.RunIntegrationTests() (getBuildParamOrDefault "esversions" "")
+Target "Integrate"  <| fun _ -> Tests.RunIntegrationTests() (getBuildParamOrDefault "esversions" "") (getBuildParamOrDefault "escluster" "")
 
 Target "Profile" <| fun _ -> Profiler.Run()
 

build/scripts/Testing.fsx

@@ -37,12 +37,13 @@ module Tests =
         testProjectJson "all"
 
 
-    let RunIntegrationTests() commaSeparatedEsVersions =
+    let RunIntegrationTests() commaSeparatedEsVersions clusterFilter =
         let esVersions = 
             match commaSeparatedEsVersions with
             | "" -> failwith "when running integrate you have to pass a comma separated list of elasticsearch versions to test"
             | _ -> commaSeparatedEsVersions.Split ',' |> Array.toList 
 
         for esVersion in esVersions do
+            setProcessEnvironVar "NEST_INTEGRATION_CLUSTER" clusterFilter
             setProcessEnvironVar "NEST_INTEGRATION_VERSION" esVersion
             testDesktopClr "all"

src/Tests/Framework/Configuration/EnvironmentConfiguration.cs

@@ -12,16 +12,18 @@ public class EnvironmentConfiguration : TestConfigurationBase
 		public override bool TestAgainstAlreadyRunningElasticsearch { get; protected set; } = false;
 		public override bool ForceReseed { get; protected set; } = true;
 		public override ElasticsearchVersion ElasticsearchVersion { get; protected set; } = new ElasticsearchVersion("5.0.0");
-		public override TestMode Mode { get; protected set; } = TestMode.Unit;
-
+		public override TestMode Mode { get; protected set; } = TestMode.Unit;
+		public override string ClusterFilter { get; protected set; }
+
 		public EnvironmentConfiguration()
 		{
 			//if env var NEST_INTEGRATION_VERSION is set assume integration mode
 			//used by the build script FAKE
 			var version = Environment.GetEnvironmentVariable("NEST_INTEGRATION_VERSION");
-			if (!string.IsNullOrEmpty(version)) Mode = TestMode.Integration;
+			if (!string.IsNullOrEmpty(version)) Mode = TestMode.Integration;
 
 			this.ElasticsearchVersion = new ElasticsearchVersion(string.IsNullOrWhiteSpace(version) ? "5.0.0" : version);
+			this.ClusterFilter = Environment.GetEnvironmentVariable("NEST_INTEGRATION_CLUSTER");
 		}
 	}
 }

src/Tests/Framework/Configuration/ITestConfiguration.cs

@@ -10,7 +10,8 @@ namespace Tests.Framework.Configuration
 	public interface ITestConfiguration
 	{
 		TestMode Mode { get; }
-		ElasticsearchVersion ElasticsearchVersion { get; }
+		ElasticsearchVersion ElasticsearchVersion { get; }
+		string ClusterFilter { get; }
 		bool ForceReseed { get; }
 		bool TestAgainstAlreadyRunningElasticsearch { get; }
 

src/Tests/Framework/Configuration/NodeConfiguration.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using Tests.Framework.Configuration;
 using Tests.Framework.Versions;
@@ -11,21 +12,23 @@ public class NodeConfiguration : ITestConfiguration
 		public bool ForceReseed { get; }
 		public bool TestAgainstAlreadyRunningElasticsearch { get; }
 		public bool RunIntegrationTests { get; }
-		public bool RunUnitTests { get; }
+		public bool RunUnitTests { get; }
+		public string ClusterFilter { get; }
 
 		public string TypeOfCluster { get; set; }
 		public ElasticsearchPlugin[] RequiredPlugins { get; set; } = { };
 
-		public bool ShieldEnabled => this.RequiredPlugins.Contains(ElasticsearchPlugin.XPack);
-
+		public bool ShieldEnabled => this.RequiredPlugins.Contains(ElasticsearchPlugin.XPack);
+
 		public NodeConfiguration(ITestConfiguration configuration)
 		{
 			this.Mode = configuration.Mode;
 			this.ElasticsearchVersion = configuration.ElasticsearchVersion;
 			this.ForceReseed = configuration.ForceReseed;
 			this.TestAgainstAlreadyRunningElasticsearch = configuration.TestAgainstAlreadyRunningElasticsearch;
 			this.RunIntegrationTests = configuration.RunIntegrationTests;
-			this.RunUnitTests = configuration.RunUnitTests;
+			this.RunUnitTests = configuration.RunUnitTests;
+			this.ClusterFilter = configuration.ClusterFilter;
 		}
 	}
 }

src/Tests/Framework/Configuration/TestConfigurationBase.cs

@@ -12,7 +12,8 @@ public abstract class TestConfigurationBase : ITestConfiguration
 		public abstract bool TestAgainstAlreadyRunningElasticsearch { get; protected set; }
 		public abstract ElasticsearchVersion ElasticsearchVersion { get; protected set; }
 		public abstract bool ForceReseed { get; protected set; }
-		public abstract TestMode Mode { get; protected set; }
+		public abstract TestMode Mode { get; protected set; }
+		public abstract string ClusterFilter { get; protected set; }
 
 		public virtual bool RunIntegrationTests => Mode == TestMode.Mixed || Mode == TestMode.Integration;
 		public virtual bool RunUnitTests => Mode == TestMode.Mixed || Mode == TestMode.Unit;

src/Tests/Framework/Configuration/YamlConfiguration.cs

@@ -10,8 +10,8 @@ public class YamlConfiguration : TestConfigurationBase
 		public override bool TestAgainstAlreadyRunningElasticsearch { get; protected set; } = true;
 		public override ElasticsearchVersion ElasticsearchVersion { get; protected set; }
 		public override bool ForceReseed { get; protected set; } = true;
-		public override TestMode Mode { get; protected set; } = TestMode.Unit;
-
+		public override TestMode Mode { get; protected set; } = TestMode.Unit;
+		public override string ClusterFilter { get; protected set; }
 
 		public YamlConfiguration(string configurationFile)
 		{
@@ -25,6 +25,7 @@ public YamlConfiguration(string configurationFile)
 			this.ElasticsearchVersion = new ElasticsearchVersion(config["elasticsearch_version"]);
 			this.ForceReseed = bool.Parse(config["force_reseed"]);
 			this.TestAgainstAlreadyRunningElasticsearch = bool.Parse(config["test_against_already_running_elasticsearch"]);
+			this.ClusterFilter = config["cluster_filter"];
 		}
 
 		private static string ConfigName(string configLine) => Parse(configLine, 0);

src/Tests/Framework/Xunit/TestAssemblyRunner.cs

@@ -64,17 +64,19 @@ orderby g.Count() descending
 
 			var summaries = new ConcurrentBag<RunSummary>();
 			var clusterTotals = new Dictionary<string, Stopwatch>();
+			var clusterFilter = TestClient.Configuration.ClusterFilter;
 			foreach (var group in grouped)
 			{
-				//if (group.Key?.GetType() != typeof(WritableCluster)) continue;
 				var type = group.Key?.GetType();
 				var clusterName = type?.Name.Replace("Cluster", "") ?? "UNKNOWN";
+
+				if (!string.IsNullOrWhiteSpace(clusterFilter) && !string.Equals(clusterName, clusterFilter, StringComparison.InvariantCultureIgnoreCase))
+					continue;
+
 				var dop = group.Key != null && group.Key.MaxConcurrency > 0
 					? group.Key.MaxConcurrency
 					: defaultMaxConcurrency;
 
-				//if (type != typeof(ReadOnlyCluster)) continue;
-
 				clusterTotals.Add(clusterName, Stopwatch.StartNew());
 
 				//We group over each cluster group and execute test classes pertaining to that cluster

src/Tests/Framework/Xunit/TestFramework.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Reflection;
 using Tests.Framework;
+using Tests.Framework.Configuration;
 using Xunit.Abstractions;
 using Xunit.Sdk;
 
@@ -19,7 +20,9 @@ protected override ITestFrameworkExecutor CreateExecutor(AssemblyName assemblyNa
 			Console.WriteLine($" - {nameof(config.TestAgainstAlreadyRunningElasticsearch)}: {config.TestAgainstAlreadyRunningElasticsearch}");
 			Console.WriteLine($" - {nameof(config.ElasticsearchVersion)}: {config.ElasticsearchVersion}");
 			Console.WriteLine($" - {nameof(config.ForceReseed)}: {config.ForceReseed}");
-			Console.WriteLine($" - {nameof(config.Mode)}: {config.Mode.ToString()}");
+			Console.WriteLine($" - {nameof(config.Mode)}: {config.Mode.ToString()}");
+			if (config.Mode == TestMode.Integration)
+				Console.WriteLine($" - {nameof(config.ClusterFilter)}: {config.ClusterFilter}");
 			Console.WriteLine($" - {nameof(config.RunIntegrationTests)}: {config.RunIntegrationTests}");
 			Console.WriteLine($" - {nameof(config.RunUnitTests)}: {config.RunUnitTests}");
 

src/Tests/tests.yaml

@@ -3,6 +3,8 @@ mode: i
 # the elasticsearch version that should be started
 # Can be a snapshot version of sonatype or "latest" to get the latest snapshot of sonatype
 elasticsearch_version: 5.0.1
+# cluster filter allows you to only run the integration tests of a particular cluster (cluster suffix not needed)
+cluster_filter: 
 # whether we want to forcefully reseed on the node, if you are starting the tests with a node already running
 force_reseed: true
 # do not spawn nodes as part of the test setup if we find a node is already running