Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit d076506

Browse files
committedMar 17, 2025··
Removes sample plugin, common and client related changes
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
1 parent e6a47f5 commit d076506

File tree

98 files changed

+54
-10996
lines changed

Some content is hidden

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

98 files changed

+54
-10996
lines changed
 

‎.github/workflows/ci.yml

+8-78
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ jobs:
4848
run: |
4949
./gradlew clean \
5050
:opensearch-resource-sharing-spi:publishToMavenLocal \
51-
:opensearch-security-common:publishToMavenLocal \
52-
:opensearch-security-client:publishToMavenLocal \
5351
-Dbuild.snapshot=false
5452
5553
- name: Cache artifacts for dependent jobs
@@ -104,7 +102,7 @@ jobs:
104102
./build/reports/
105103
106104
report-coverage:
107-
needs: ["test", "integration-tests", "spi-tests", "sample-plugin-integration-tests"]
105+
needs: ["test", "integration-tests", "spi-tests"]
108106
runs-on: ubuntu-latest
109107
steps:
110108
- uses: actions/checkout@v4
@@ -168,47 +166,6 @@ jobs:
168166
path: |
169167
./build/reports/
170168
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/cache@v4.2.2
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-
212169
spi-tests:
213170
name: spi-tests
214171
needs: publish-components-to-maven-local
@@ -378,58 +335,31 @@ jobs:
378335
./gradlew clean :opensearch-resource-sharing-spi:publishToMavenLocal -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier-all.jar
379336
./gradlew clean :opensearch-resource-sharing-spi:publishToMavenLocal -Dbuild.version_qualifier=$test_qualifier && test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT-all.jar
380337
381-
# Publish Common
382-
./gradlew clean :opensearch-security-common:publishToMavenLocal && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version-all.jar
383-
./gradlew clean :opensearch-security-common:publishToMavenLocal -Dbuild.snapshot=false && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_no_snapshot-all.jar
384-
./gradlew clean :opensearch-security-common:publishToMavenLocal -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier-all.jar
385-
./gradlew clean :opensearch-security-common:publishToMavenLocal -Dbuild.version_qualifier=$test_qualifier && test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT-all.jar
386-
387-
# Publish Client
388-
./gradlew clean :opensearch-security-client:publishToMavenLocal && test -s ./client/build/libs/opensearch-security-client-$security_plugin_version-all.jar
389-
./gradlew clean :opensearch-security-client:publishToMavenLocal -Dbuild.snapshot=false && test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_no_snapshot-all.jar
390-
./gradlew clean :opensearch-security-client:publishToMavenLocal -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier-all.jar
391-
./gradlew clean :opensearch-security-client:publishToMavenLocal -Dbuild.version_qualifier=$test_qualifier && test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT-all.jar
392338
393339
# Build artifacts
394-
./gradlew clean :assemble && \
340+
./gradlew clean assemble && \
395341
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 && \
397-
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version.jar && \
398-
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version.jar && \
399-
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version.jar
400-
342+
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version.jar
401343
402344
./gradlew clean assemble -Dbuild.snapshot=false && \
403345
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 && \
405-
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_no_snapshot.jar && \
406-
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_no_snapshot.jar && \
407-
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_no_snapshot.jar
346+
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_no_snapshot.jar
408347
409348
./gradlew clean assemble -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && \
410349
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 && \
412-
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier.jar && \
413-
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier.jar && \
414-
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier.jar
350+
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier.jar
415351
416352
./gradlew clean assemble -Dbuild.version_qualifier=$test_qualifier && \
417353
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 && \
420-
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar && \
421-
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar
354+
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version_only_number-$test_qualifier-SNAPSHOT.jar
422355
423356
./gradlew clean publishPluginZipPublicationToZipStagingRepository && \
424357
test -s ./build/distributions/opensearch-security-$security_plugin_version.zip && \
425358
test -s ./build/distributions/opensearch-security-$security_plugin_version.pom && \
426-
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version-all.jar && \
427-
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version-all.jar
359+
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version-all.jar
428360
429361
./gradlew clean publishShadowPublicationToMavenLocal && \
430-
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version-all.jar && \
431-
test -s ./common/build/libs/opensearch-security-common-$security_plugin_version-all.jar && \
432-
test -s ./client/build/libs/opensearch-security-client-$security_plugin_version-all.jar
362+
test -s ./spi/build/libs/opensearch-resource-sharing-spi-$security_plugin_version-all.jar
433363
434364
- name: List files in build directory on failure
435365
if: failure()

0 commit comments

Comments
 (0)