Skip to content

Commit 797f8e0

Browse files
loiclefevrembellade
authored andcommitted
HHH-19867 - Add support for Oracle 26ai in OTP
1 parent 9748c74 commit 797f8e0

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
~/.m2/wrapper/
9191
~/.gradle/caches/modules-2
9292
~/.gradle/wrapper/
93-
# A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
93+
# A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable, but it's not a problem.
9494
# The whole cache is dropped monthly to prevent unlimited growth.
9595
# The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
9696
key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
@@ -99,7 +99,7 @@ jobs:
9999
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
100100
- name: Restore Maven/Gradle Dependency/Dist Caches
101101
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
102-
# if it a pull request, we restore the cache but we don't save it
102+
# if it is a pull request, we restore the cache, but we don't save it
103103
if: github.event_name == 'pull_request'
104104
with:
105105
path: |
@@ -154,10 +154,11 @@ jobs:
154154
fail-fast: false
155155
matrix:
156156
include:
157-
#- rdbms: autonomous-transaction-processing-serverless
157+
#- rdbms: autonomous-transaction-processing-serverless-26ai
158+
#- rdbms: autonomous-transaction-processing-serverless-19c
158159
- rdbms: base-database-service-19c
159160
- rdbms: base-database-service-21c
160-
- rdbms: base-database-service-23ai
161+
- rdbms: base-database-service-26ai
161162
steps:
162163
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
163164
with:
@@ -188,7 +189,7 @@ jobs:
188189
~/.m2/wrapper/
189190
~/.gradle/caches/modules-2
190191
~/.gradle/wrapper/
191-
# A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
192+
# A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable, but it's not a problem.
192193
# The whole cache is dropped monthly to prevent unlimited growth.
193194
# The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
194195
key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
@@ -197,7 +198,7 @@ jobs:
197198
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
198199
- name: Restore Maven/Gradle Dependency/Dist Caches
199200
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
200-
# if it is a pull request, we restore the cache but we don't save it
201+
# if it is a pull request, we restore the cache, but we don't save it
201202
if: github.event_name == 'pull_request'
202203
with:
203204
path: |
@@ -211,7 +212,7 @@ jobs:
211212
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
212213
213214
- id: create_database
214-
uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
215+
uses: loiclefevre/test@a802f8bb53b42b16c253d75f86b06360d150c6e4 # v1.0.22
215216
with:
216217
oci-service: ${{ matrix.rdbms }}
217218
action: create
@@ -232,7 +233,7 @@ jobs:
232233
run: ./ci/build-github.sh
233234
shell: bash
234235

235-
- uses: loiclefevre/test@ce2f5049188a384c17ffcfcb8c8d04cf118e2cd7 # v1.0.20
236+
- uses: loiclefevre/test@a802f8bb53b42b16c253d75f86b06360d150c6e4 # v1.0.22
236237
if: always()
237238
with:
238239
oci-service: ${{ matrix.rdbms }}
@@ -298,7 +299,7 @@ jobs:
298299
~/.m2/wrapper/
299300
~/.gradle/caches/modules-2
300301
~/.gradle/wrapper/
301-
# A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable but it's not a problem.
302+
# A new cache will be stored daily. After that first store of the day, cache save actions will fail because the cache is immutable, but it's not a problem.
302303
# The whole cache is dropped monthly to prevent unlimited growth.
303304
# The cache is per branch but in case we don't find a branch for a given branch, we will get a cache from another branch.
304305
key: ${{ steps.cache-key.outputs.buildtool-cache-key }}
@@ -307,7 +308,7 @@ jobs:
307308
${{ steps.cache-key.outputs.buildtool-monthly-cache-key }}-
308309
- name: Restore Maven/Gradle Dependency/Dist Caches
309310
uses: actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
310-
# if it a pull request, we restore the cache but we don't save it
311+
# if it is a pull request, we restore the cache, but we don't save it
311312
if: github.event_name == 'pull_request'
312313
with:
313314
path: |

ci/build.sh

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@
33
goal=
44
if [ "$RDBMS" == "h2" ] || [ "$RDBMS" == "" ]; then
55
# This is the default.
6-
# - special check for Jenkins CI jobs where we don't want to run preVerifyRelease
7-
if [[ -n "$CI_SYSTEM" && "$CI_SYSTEM" != "jenkins" ]]; then
8-
goal="preVerifyRelease"
9-
# Settings needed for `preVerifyRelease` execution - for asciidoctor doc rendering
10-
export GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'
11-
fi
6+
goal="preVerifyRelease"
7+
# Settings needed for `preVerifyRelease` execution - for asciidoctor doc rendering
8+
export GRADLE_OPTS=-Dorg.gradle.jvmargs='-Dlog4j2.disableJmx -Xmx4g -XX:MaxMetaspaceSize=768m -XX:+HeapDumpOnOutOfMemoryError -Duser.language=en -Duser.country=US -Duser.timezone=UTC -Dfile.encoding=UTF-8'
129
elif [ "$RDBMS" == "hsqldb" ] || [ "$RDBMS" == "hsqldb_2_6" ]; then
1310
goal="-Pdb=hsqldb"
1411
elif [ "$RDBMS" == "mysql" ] || [ "$RDBMS" == "mysql_8_0" ]; then
@@ -56,7 +53,7 @@ elif [ "$RDBMS" == "oracle_db23c" ]; then
5653
export SERVICE=$(echo $INFO | jq -r '.database' | jq -r '.service')
5754
goal="-Pdb=oracle_cloud_db23c -DrunID=$RUNID -DdbHost=$HOST -DdbService=$SERVICE"
5855
# OTP
59-
elif [ "$RDBMS" == "autonomous-transaction-processing-serverless" ] || [ "$RDBMS" == "base-database-service-19c" ] || [ "$RDBMS" == "base-database-service-21c" ] || [ "$RDBMS" == "base-database-service-23ai" ]; then
56+
elif [ "$RDBMS" == "autonomous-transaction-processing-serverless-19c" ] || [ "$RDBMS" == "autonomous-transaction-processing-serverless-26ai" ] || [ "$RDBMS" == "autonomous-transaction-processing-serverless" ] || [ "$RDBMS" == "base-database-service-19c" ] || [ "$RDBMS" == "base-database-service-21c" ] || [ "$RDBMS" == "base-database-service-26ai" ]; then
6057
echo "Managing OTP Database..."
6158
goal="-Pdb=oracle_test_pilot_database -DrunID=$RUNID -DdbPassword=$TESTPILOT_PASSWORD -DdbConnectionStringSuffix=$TESTPILOT_CONNECTION_STRING_SUFFIX"
6259
elif [ "$RDBMS" == "db2" ]; then

0 commit comments

Comments
 (0)