Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add CI for Windows and MacOS platforms #2190

Merged
merged 22 commits into from
Oct 28, 2022
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c3995e7
Add CI for Windows and MacOS platforms
peternied Oct 24, 2022
3fb3d1a
Remove OpenSSL tests with platform quirks
peternied Oct 24, 2022
2a4ce68
Support for environment variables in other platforms
peternied Oct 25, 2022
a44c85a
Handle dash character for MacOS
peternied Oct 25, 2022
f876447
Use lazy lookahead to find the env key name
peternied Oct 25, 2022
4b31bca
Disabling flaky tests in HeapBasedRateTrackerTest
peternied Oct 25, 2022
d753335
Disable testSpecialUsernames broken on Windows
peternied Oct 25, 2022
e704db9
Enable retries on integration tests
peternied Oct 26, 2022
d9aa6cf
Disable OpenSSL on Windows and Mac
peternied Oct 26, 2022
d2a8952
Remove env variable for OpenSSL setup
peternied Oct 26, 2022
49016cd
Fix checkstyle issue
peternied Oct 26, 2022
c937165
Move validation steps in separate jobs
peternied Oct 26, 2022
df79cef
Protect against random failures due to document count
peternied Oct 26, 2022
dbe4669
Ensure integrationTest is not run in primary workflow
peternied Oct 26, 2022
5c7123e
Verify that removing the clean step unblocks the tests
peternied Oct 26, 2022
97d1f77
Run all impacted tests only
peternied Oct 26, 2022
5a7154f
Merge remote-tracking branch 'origin/main' into more-platforms
peternied Oct 26, 2022
70a4cf3
Verify SSL tests are in order
peternied Oct 26, 2022
e167fd7
Disable OpenSSL for only Windows
peternied Oct 26, 2022
221ece1
Fix build break
peternied Oct 26, 2022
5f8211c
Clean up for review readiness
peternied Oct 26, 2022
7fe3292
Remove testEnsureOpenSSLAvailabilit that wass unreliable
peternied Oct 27, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ env:
jobs:
build:
name: build
runs-on: ubuntu-latest
strategy:
fail-fast: true
fail-fast: false
matrix:
jdk: [11, 17]
platform: ["ubuntu-latest", "windows-latest", "macos-latest"]
runs-on: ${{ matrix.platform }}

steps:

Expand All @@ -36,10 +37,16 @@ jobs:
${{ runner.os }}-gradle-

- name: Package
run: ./gradlew clean build -Dbuild.snapshot=false -x test -x integrationTest
uses: gradle/gradle-build-action@v2
with:
arguments: clean build -Dbuild.snapshot=false -x test -x integrationTest

- name: Test
run: OPENDISTRO_SECURITY_TEST_OPENSSL_OPT=true ./gradlew test integrationTest
uses: gradle/gradle-build-action@v2
env:
OPENDISTRO_SECURITY_TEST_OPENSSL_OPT: false
with:
arguments: test integrationTest

- name: Coverage
uses: codecov/codecov-action@v1
Expand All @@ -50,13 +57,13 @@ jobs:
- uses: actions/upload-artifact@v3
if: always()
with:
name: ${{ matrix.jdk }}-reports
name: ${{ matrix.platform }}-JDK${{ matrix.jdk }}-reports
path: |
./build/reports/

- name: check archive for debugging
if: always()
run: echo "Check the artifact ${{ matrix.jdk }}-reports.zip for detailed test results"
run: echo "Check the artifact ${{ matrix.platform }}-JDK${{ matrix.jdk }}-reports for detailed test results"

backward-compatibility:
runs-on: ubuntu-latest
Expand Down
247 changes: 0 additions & 247 deletions src/test/java/org/opensearch/security/ssl/OpenSSLTest.java

This file was deleted.