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.

Sign up for GitHub

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

[CI] Add integration test for MariaDB 11.4 and Oracle 19 #2061

Merged
merged 5 commits into from
Jul 26, 2024
Merged

[CI] Add integration test for MariaDB 11.4 and Oracle 19 #2061

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
753d250
Add CI for Oracle 19 and MariaDB 11.4
Torch3333 Jul 11, 2024
768b62b
Remove necessary env variable [skip ci]
Torch3333 Jul 17, 2024
d4c15a0
Remove Oracle 18 int test
Torch3333 Jul 17, 2024
89f6a48
Merge branch 'master' into ci_oracle_19_maria_db_11
brfrn169 Jul 24, 2024
4c0cbc5
Merge branch 'master' into ci_oracle_19_maria_db_11
brfrn169 Jul 26, 2024
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
79 changes: 66 additions & 13 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,26 +880,19 @@ jobs:
with:
name: postgresql_15_integration_test_reports_${{ matrix.mode.label }}
path: core/build/reports/tests/integrationTestJdbc

integration-test-for-jdbc-oracle-18:
name: Oracle 18 integration test (${{ matrix.mode.label }})
integration-test-for-jdbc-oracle-19:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we've added this, we can remove integration-test-for-jdbc-oracle-18.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, it's revised in d4c15a0

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we keep Oracle 18 on the CI for already released versions? Do you think about keeping Oracle 18 on the Supported database documentation or replacing it with Oracle 19 ?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can delete Oracle 18 from the supported database documentation. @feeblefakie What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@brfrn169 I think so. The updated version is in my PR, so let me handle this.

name: Oracle 19 integration test (${{ matrix.mode.label }})
runs-on: ubuntu-latest

services:
oracle:
image: ghcr.io/scalar-labs/oracle/db-prebuilt:18
image: ghcr.io/scalar-labs/oracle/db-prebuilt:19
credentials:
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}
env:
ORACLE_PWD: Oracle
ports:
- 1521:1521
options: >-
--health-cmd "/opt/oracle/checkDBStatus.sh"
--health-interval 10s
--health-timeout 5s
--health-retries 120

strategy:
matrix:
Expand Down Expand Up @@ -943,13 +936,13 @@ jobs:
- name: Setup and execute Gradle 'integrationTestJdbc' task
uses: gradle/gradle-build-action@v3
with:
arguments: integrationTestJdbc -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/XEPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}
arguments: integrationTestJdbc -Dscalardb.jdbc.url=jdbc:oracle:thin:@//localhost:1521/ORCLPDB1 -Dscalardb.jdbc.username=SYSTEM -Dscalardb.jdbc.password=Oracle ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}

- name: Upload Gradle test reports
if: always()
uses: actions/upload-artifact@v4
with:
name: oracle_18_integration_test_reports_${{ matrix.mode.label }}
name: oracle_19_integration_test_reports_${{ matrix.mode.label }}
path: core/build/reports/tests/integrationTestJdbc

integration-test-for-jdbc-oracle-21:
Expand Down Expand Up @@ -1431,6 +1424,66 @@ jobs:
name: mariadb_10_integration_test_reports_${{ matrix.mode.label }}
path: core/build/reports/tests/integrationTestJdbc

integration-test-for-jdbc-mariadb-11-4:
name: MariaDB 11.4 integration test (${{ matrix.mode.label }})
runs-on: ubuntu-latest

strategy:
matrix:
mode:
- label: default
group_commit_enabled: false
- label: with_group_commit
group_commit_enabled: true


steps:
- name: Run MariaDB 11.4
run: |
docker run -e MYSQL_ROOT_PASSWORD=mysql -p 3306:3306 -d mariadb:11.4 --character-set-server=utf8mb4 --collation-server=utf8mb4_bin

- uses: actions/checkout@v4

- name: Set up JDK ${{ env.JAVA_VERSION }} (${{ env.JAVA_VENDOR }})
uses: actions/setup-java@v4
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: ${{ env.JAVA_VENDOR }}

- name: Set up JDK ${{ env.INT_TEST_JAVA_RUNTIME_VERSION }} (${{ env.INT_TEST_JAVA_RUNTIME_VENDOR }}) to run integration test
uses: actions/setup-java@v4
if: ${{ env.SET_UP_INT_TEST_RUNTIME_JDK_WHEN_NOT_ORACLE_8_OR_11 == 'true'}}
with:
java-version: ${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}
distribution: ${{ env.INT_TEST_JAVA_RUNTIME_VENDOR }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
if: ${{ env.SET_UP_INT_TEST_RUNTIME_ORACLE_JDK_8_OR_11 == 'true'}}
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.CR_PAT }}

- name: Set up JDK ${{ env.INT_TEST_JAVA_RUNTIME_VERSION }} (oracle) to run the integration test
if: ${{ env.SET_UP_INT_TEST_RUNTIME_ORACLE_JDK_8_OR_11 == 'true'}}
run: |
container_id=$(docker create "ghcr.io/scalar-labs/oracle/jdk:${{ env.INT_TEST_JAVA_RUNTIME_VERSION }}-linux")
docker cp "$container_id:oracle-jdk.tar.gz" . && docker rm "$container_id"
tar -xzf oracle-jdk.tar.gz -C /usr/lib/jvm

- name: Setup and execute Gradle 'integrationTestJdbc' task
uses: gradle/gradle-build-action@v3
with:
arguments: integrationTestJdbc ${{ matrix.mode.group_commit_enabled && env.INT_TEST_GRADLE_OPTIONS_FOR_GROUP_COMMIT || '' }}

- name: Upload Gradle test reports
if: always()
uses: actions/upload-artifact@v4
with:
name: mariadb_11.4_integration_test_reports_${{ matrix.mode.label }}
path: core/build/reports/tests/integrationTestJdbc

integration-test-for-jdbc-yugabytedb-2:
name: YugabyteDB 2 integration test (${{ matrix.mode.label }})
runs-on: ubuntu-latest
Expand Down
Loading