diff --git a/build.gradle b/build.gradle index 8b6cbb7d..1cc72769 100644 --- a/build.gradle +++ b/build.gradle @@ -482,6 +482,7 @@ clusters.each { name -> } } } + List> replPluginProvider = [ provider(new Callable(){ @Override @@ -495,9 +496,6 @@ List> replPluginProvider = [ } }) ] -if(securityEnabled) { - replPluginProvider.append(provider(securityPluginFile)) -} /* Sets up and runs sanity test on older version clusters. We maintain 2 set of tasks here with. diff --git a/src/test/resources/security/plugin/opensearch-security-1.1.0.0.zip b/src/test/resources/security/plugin/opensearch-security-1.3.0.0-SNAPSHOT.zip similarity index 89% rename from src/test/resources/security/plugin/opensearch-security-1.1.0.0.zip rename to src/test/resources/security/plugin/opensearch-security-1.3.0.0-SNAPSHOT.zip index aa07d925..90acd31a 100644 Binary files a/src/test/resources/security/plugin/opensearch-security-1.1.0.0.zip and b/src/test/resources/security/plugin/opensearch-security-1.3.0.0-SNAPSHOT.zip differ diff --git a/src/test/resources/security/scripts/SecurityAdminWrapper.sh b/src/test/resources/security/scripts/SecurityAdminWrapper.sh deleted file mode 100755 index 627eab92..00000000 --- a/src/test/resources/security/scripts/SecurityAdminWrapper.sh +++ /dev/null @@ -1,31 +0,0 @@ -# -# SPDX-License-Identifier: Apache-2.0 -# -# The OpenSearch Contributors require contributions made to -# this file be licensed under the Apache-2.0 license or a -# compatible open source license. -# -# Modifications Copyright OpenSearch Contributors. See -# GitHub history for details. -# - -#!/bin/bash - -BUILD_DIR=$1 -LEADER_CONFIG_DIR=$BUILD_DIR/testclusters/leaderCluster-0/config -LEADER_PLUGIN_DIR=$BUILD_DIR/testclusters/leaderCluster-0/distro/1.3.0-INTEG_TEST/plugins/opensearch-security/ -FOLLOWER_CONFIG_DIR=$BUILD_DIR/testclusters/followCluster-0/config -FOLLOWER_PLUGIN_DIR=$BUILD_DIR/testclusters/followCluster-0/distro/1.3.0-INTEG_TEST/plugins/opensearch-security/ ->>>>>>> ce6da91 (Increment version to 1.3.0.) - -"$LEADER_PLUGIN_DIR/tools/securityadmin.sh" -p 9300 \ --cd "$LEADER_PLUGIN_DIR/securityconfig" \ --icl -key "$LEADER_CONFIG_DIR/kirk-key.pem" \ --cert "$LEADER_CONFIG_DIR/kirk.pem" \ --cacert "$LEADER_CONFIG_DIR/root-ca.pem" -nhnv - -"$FOLLOWER_PLUGIN_DIR/tools/securityadmin.sh" -p 9301 \ --cd "$FOLLOWER_PLUGIN_DIR/securityconfig" \ --icl -key "$FOLLOWER_CONFIG_DIR/kirk-key.pem" \ --cert "$FOLLOWER_CONFIG_DIR/kirk.pem" \ --cacert "$FOLLOWER_CONFIG_DIR/root-ca.pem" -nhnv