|
48 | 48 | run: |
|
49 | 49 | ./gradlew clean \
|
50 | 50 | :opensearch-resource-sharing-spi:publishToMavenLocal \
|
51 |
| - :opensearch-security-common:publishToMavenLocal \ |
52 |
| - :opensearch-security-client:publishToMavenLocal \ |
53 | 51 | -Dbuild.snapshot=false
|
54 | 52 |
|
55 | 53 | - name: Cache artifacts for dependent jobs
|
@@ -104,7 +102,7 @@ jobs:
|
104 | 102 | ./build/reports/
|
105 | 103 |
|
106 | 104 | report-coverage:
|
107 |
| - needs: ["test", "integration-tests", "spi-tests", "sample-plugin-integration-tests"] |
| 105 | + needs: ["test", "integration-tests", "spi-tests"] |
108 | 106 | runs-on: ubuntu-latest
|
109 | 107 | steps:
|
110 | 108 | - uses: actions/checkout@v4
|
@@ -168,47 +166,6 @@ jobs:
|
168 | 166 | path: |
|
169 | 167 | ./build/reports/
|
170 | 168 |
|
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 |
| -
|
212 | 169 | spi-tests:
|
213 | 170 | name: spi-tests
|
214 | 171 | needs: publish-components-to-maven-local
|
@@ -378,58 +335,31 @@ jobs:
|
378 | 335 | ./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
|
379 | 336 | ./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
|
380 | 337 |
|
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 |
392 | 338 |
|
393 | 339 | # Build artifacts
|
394 |
| - ./gradlew clean :assemble && \ |
| 340 | + ./gradlew clean assemble && \ |
395 | 341 | 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 |
401 | 343 |
|
402 | 344 | ./gradlew clean assemble -Dbuild.snapshot=false && \
|
403 | 345 | 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 |
408 | 347 |
|
409 | 348 | ./gradlew clean assemble -Dbuild.snapshot=false -Dbuild.version_qualifier=$test_qualifier && \
|
410 | 349 | 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 |
415 | 351 |
|
416 | 352 | ./gradlew clean assemble -Dbuild.version_qualifier=$test_qualifier && \
|
417 | 353 | 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 |
422 | 355 |
|
423 | 356 | ./gradlew clean publishPluginZipPublicationToZipStagingRepository && \
|
424 | 357 | test -s ./build/distributions/opensearch-security-$security_plugin_version.zip && \
|
425 | 358 | 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 |
428 | 360 |
|
429 | 361 | ./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 |
433 | 363 |
|
434 | 364 | - name: List files in build directory on failure
|
435 | 365 | if: failure()
|
|
0 commit comments