Skip to content

Commit b8c4c74

Browse files
Removes sample resource plugin and cleans up workflows and docs
Signed-off-by: Darshit Chanpura <[email protected]>
1 parent 2d19530 commit b8c4c74

File tree

52 files changed

+1
-4195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1
-4195
lines changed

.github/workflows/ci.yml

+1-47
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
./build/reports/
105105
106106
report-coverage:
107-
needs: ["test", "integration-tests", "spi-tests", "sample-plugin-integration-tests"]
107+
needs: ["test", "integration-tests", "spi-tests"]
108108
runs-on: ubuntu-latest
109109
steps:
110110
- uses: actions/checkout@v4
@@ -168,47 +168,6 @@ jobs:
168168
path: |
169169
./build/reports/
170170
171-
sample-plugin-integration-tests:
172-
name: sample-plugin-integration-tests
173-
needs: publish-components-to-maven-local
174-
strategy:
175-
fail-fast: false
176-
matrix:
177-
jdk: [21]
178-
platform: [ubuntu-latest, windows-latest]
179-
runs-on: ${{ matrix.platform }}
180-
181-
steps:
182-
- name: Set up JDK for build and test
183-
uses: actions/setup-java@v4
184-
with:
185-
distribution: temurin # Temurin is a distribution of adoptium
186-
java-version: ${{ matrix.jdk }}
187-
188-
- name: Checkout security
189-
uses: actions/checkout@v4
190-
191-
- name: Restore Maven Local Cache
192-
uses: actions/[email protected]
193-
with:
194-
path: ~/.m2/repository/org/opensearch/
195-
key: maven-local-${{ github.run_id }}
196-
restore-keys: |
197-
maven-local-
198-
199-
- name: Run SampleResourcePlugin Integration Tests
200-
uses: gradle/gradle-build-action@v3
201-
with:
202-
arguments: |
203-
:opensearch-sample-resource-plugin:integrationTest -Dbuild.snapshot=false
204-
205-
- uses: actions/upload-artifact@v4
206-
if: always()
207-
with:
208-
name: sample-plugin-integration-${{ matrix.platform }}-JDK${{ matrix.jdk }}-reports
209-
path: |
210-
./build/reports/
211-
212171
spi-tests:
213172
name: spi-tests
214173
needs: publish-components-to-maven-local
@@ -393,30 +352,25 @@ jobs:
393352
# Build artifacts
394353
./gradlew clean :assemble && \
395354
test -s ./build/distributions/opensearch-security-$security_plugin_version.zip && \
396-
test -s ./sample-resource-plugin/build/distributions/opensearch-sample-resource-plugin-$security_plugin_version.zip && \
397355
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version.jar && \
398356
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version.jar && \
399357
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version.jar
400358
401359
402360
./gradlew clean assemble -Dbuild.snapshot=false && \
403361
test -s ./build/distributions/opensearch-security-$security_plugin_version_no_snapshot.zip && \
404-
test -s ./sample-resource-plugin/build/distributions/opensearch-sample-resource-plugin-$security_plugin_version_no_snapshot.zip && \
405362
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_no_snapshot.jar && \
406363
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_no_snapshot.jar && \
407364
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_no_snapshot.jar
408365
409366
./gradlew clean assemble -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && \
410367
test -s ./build/distributions/opensearch-security-$security_plugin_version_only_number-$test_qualifier.zip && \
411-
test -s ./sample-resource-plugin/build/distributions/opensearch-sample-resource-plugin-$security_plugin_version_only_number-$test_qualifier.zip && \
412368
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier.jar && \
413369
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier.jar && \
414370
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier.jar
415371
416372
./gradlew clean assemble -Dbuild.version_qualifier=$test_qualifier && \
417373
test -s ./build/distributions/opensearch-security-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.zip && \
418-
test -s ./sample-resource-plugin/build/distributions/opensearch-sample-resource-plugin-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.zip && \
419-
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar && \
420374
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar && \
421375
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar
422376

build.gradle

-3
Original file line numberDiff line numberDiff line change
@@ -594,9 +594,6 @@ sourceSets {
594594

595595
//add new task that runs integration tests
596596
task integrationTest(type: Test) {
597-
filter {
598-
excludeTestsMatching 'org.opensearch.sample.*ResourcePlugin*'
599-
}
600597
doFirst {
601598
// Only run resources tests on resource-test CI environments or locally
602599
if (System.getenv('CI_ENVIRONMENT') != 'resource-test' && System.getenv('CI_ENVIRONMENT') != null) {

sample-resource-plugin/README.md

-200
This file was deleted.

0 commit comments

Comments
 (0)