Skip to content

Commit

Permalink
Merge branch 'main' into support-switch-aliases-in-shrink-action
Browse files Browse the repository at this point in the history
Signed-off-by: Oleg Kravchuk <[email protected]>
  • Loading branch information
ikibo authored Oct 24, 2023
2 parents f629a7d + 6aad0be commit fe1460c
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
7 changes: 4 additions & 3 deletions .github/workflows/docker-security-test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,10 @@ jobs:
- name: Run Index Management Test for security enabled test cases
if: env.imagePresent == 'true'
run: |
cluster_running=`curl -XGET https://localhost:9200/_cat/plugins -u admin:admin --insecure`
echo $cluster_running
security=`curl -XGET https://localhost:9200/_cat/plugins -u admin:admin --insecure |grep opensearch-security|wc -l`
container_id=`docker ps -q`
plugins=`docker exec $container_id /usr/share/opensearch/bin/opensearch-plugin list`
echo "plugins: $plugins"
security=`echo $plugins | grep opensearch-security | wc -l`
echo $security
if [ $security -gt 0 ]
then
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ task integTestRemote(type: RestIntegTestTask) {

// === Set up BWC tests ===

String bwcVersionShort = "2.11.0"
String bwcVersionShort = "2.12.0"
String bwcVersion = bwcVersionShort + ".0"
String baseName = "indexmanagementBwcCluster"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ data class Transform(
aggregations.aggregatorFactories.forEach {
require(supportedAggregations.contains(it.type)) { "Unsupported aggregation [${it.type}]" }
}
aggregations.pipelineAggregatorFactories.forEach {
require(supportedAggregations.contains(it.type)) { "Unsupported aggregation [${it.type}]" }
}
when (jobSchedule) {
is CronSchedule -> {
// Job scheduler already correctly throws errors for this
Expand Down

0 comments on commit fe1460c

Please sign in to comment.