diff --git a/.github/actions/build-opensearch/action.yml b/.github/actions/build-opensearch/action.yml index 8ad36ee266..9c3d640df0 100644 --- a/.github/actions/build-opensearch/action.yml +++ b/.github/actions/build-opensearch/action.yml @@ -15,7 +15,7 @@ inputs: plugins_output_directory: description: The directory to output the plugins to default: "" -outputs: +outputs: distribution: description: The path to the OpenSearch distribution value: ${{ steps.determine.outputs.distribution }} @@ -36,11 +36,11 @@ runs: ./opensearch/distribution/archives/linux-tar/build/distributions/opensearch-*.tar.gz ./opensearch/plugins/*/build/distributions/*.zip build_script: | - ./gradlew :distribution:archives:linux-tar:assemble -Dbuild.snapshot=${{ inputs.build_snapshot }} + ./gradlew --stacktrace :distribution:archives:linux-tar:assemble -Dbuild.snapshot=${{ inputs.build_snapshot }} PluginList=("analysis-icu" "analysis-kuromoji" "analysis-nori" "analysis-phonetic" "ingest-attachment" "mapper-murmur3") for plugin in ${PluginList[*]}; do - ./gradlew :plugins:$plugin:assemble -Dbuild.snapshot=${{ inputs.build_snapshot }} + ./gradlew --stacktrace :plugins:$plugin:assemble -Dbuild.snapshot=${{ inputs.build_snapshot }} done - name: Determine OpenSearch distribution path and version @@ -62,7 +62,7 @@ runs: cache_key_suffix: ${{ inputs.build_snapshot == 'true' && '-snapshot' || '' }} cached_paths: | ./opensearch-security/build/distributions/opensearch-security-*.zip - build_script: ./gradlew assemble -Dopensearch.version=${{ steps.determine.outputs.version }} -Dbuild.snapshot=${{ inputs.build_snapshot }} + build_script: ./gradlew --stacktrace assemble -Dopensearch.version=${{ steps.determine.outputs.version }} -Dbuild.snapshot=${{ inputs.build_snapshot }} - name: Restore or Build OpenSearch k-NN uses: ./client/.github/actions/cached-git-build @@ -76,7 +76,7 @@ runs: ./opensearch-knn/build/distributions/opensearch-knn-*.zip build_script: | sudo apt-get install -y libopenblas-dev libomp-dev - ./gradlew buildJniLib assemble -Dopensearch.version=${{ steps.determine.outputs.version }} -Dbuild.snapshot=${{ inputs.build_snapshot }} + ./gradlew --stacktrace buildJniLib assemble -Dopensearch.version=${{ steps.determine.outputs.version }} -Dbuild.snapshot=${{ inputs.build_snapshot }} distributions=./build/distributions lib_dir=$distributions/lib mkdir $lib_dir diff --git a/build/scripts/scripts.fsproj b/build/scripts/scripts.fsproj index e98ae8fc61..253f9523e5 100644 --- a/build/scripts/scripts.fsproj +++ b/build/scripts/scripts.fsproj @@ -32,15 +32,17 @@ license-header-fs.txt + + - + - + diff --git a/tests/Tests.Core/ManagedOpenSearch/Clusters/ReadOnlyCluster.cs b/tests/Tests.Core/ManagedOpenSearch/Clusters/ReadOnlyCluster.cs index 26186c3351..2ddf421c8f 100644 --- a/tests/Tests.Core/ManagedOpenSearch/Clusters/ReadOnlyCluster.cs +++ b/tests/Tests.Core/ManagedOpenSearch/Clusters/ReadOnlyCluster.cs @@ -41,7 +41,7 @@ public ReadOnlyCluster() : base(Knn, MapperMurmur3, Security) { } public class ReplicatedReadOnlyCluster : ClientTestClusterBase { - public ReplicatedReadOnlyCluster() : base(new ClientTestClusterConfiguration(numberOfNodes: 2, plugins: new[] {Knn, MapperMurmur3, Security})) { } + public ReplicatedReadOnlyCluster() : base(new ClientTestClusterConfiguration(numberOfNodes: 2, plugins: [Knn, MapperMurmur3, Security])) { } protected override void SeedNode() => new DefaultSeeder(Client, new IndexSettings { diff --git a/tests/Tests/Cat/CatSegmentReplication/CatSegmentReplicationApiTests.cs b/tests/Tests/Cat/CatSegmentReplication/CatSegmentReplicationApiTests.cs index 1c5aab5b9e..6c6daf1755 100644 --- a/tests/Tests/Cat/CatSegmentReplication/CatSegmentReplicationApiTests.cs +++ b/tests/Tests/Cat/CatSegmentReplication/CatSegmentReplicationApiTests.cs @@ -7,6 +7,7 @@ using System; using System.Linq; +using System.Threading; using FluentAssertions; using OpenSearch.Client; using OpenSearch.Net; @@ -45,9 +46,13 @@ protected override void ExpectResponse(CatResponse response.Records.Should().NotBeEmpty().And.AllSatisfy(r => r.ShardId.Should().StartWith($"[{IndexName}]")); protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueValues values) - { + { + client.Cat.Nodes().Records.Should().HaveCount(2); + var resp = client.Indices.Create(IndexName, d => d .Settings(s => s + .NumberOfShards(3) + .NumberOfReplicas(2) .Setting("index.replication.type", "SEGMENT"))); resp.ShouldBeValid(); @@ -56,9 +61,9 @@ protected override void IntegrationSetup(IOpenSearchClient client, CallUniqueVal .IndexMany(Enumerable.Range(0, 10).Select(i => new Doc { Id = i })) .Refresh(Refresh.WaitFor)); bulkResp.ShouldBeValid(); - } - protected override void IntegrationTeardown(IOpenSearchClient client, CallUniqueValues values) => client.Indices.Delete(IndexName); + Thread.Sleep(10000); + } public class Doc {