From 68c4d6b00c98e161071c2f7a977961cd453d1a06 Mon Sep 17 00:00:00 2001 From: Vincent Guilpain Date: Wed, 19 Jun 2024 21:13:51 +0900 Subject: [PATCH] Fix CosmosDB CI when running integration test with JDK11+ (#1919) --- .github/workflows/ci.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d545194d44..689e84a6b2 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -277,8 +277,14 @@ jobs: Export-Certificate @params certutil -encode $home/tmp-cert.cer $home/cosmosdbcert.cer Remove-Item $home/tmp-cert.cer - & ${env:JAVA_HOME}/bin/keytool.exe -keystore ${env:JAVA_HOME}/jre/lib/security/cacerts -storepass 'changeit' -importcert -noprompt -alias cosmos_emulator -file $home/cosmosdbcert.cer - & ${env:JAVA_HOME}/bin/keytool.exe -keystore ${env:JAVA_HOME}/jre/lib/security/cacerts -storepass 'changeit' -list -alias cosmos_emulator + # Setting the keystore option differs between Java 8 and Java 11+ + if ( ${env:INT_TEST_JAVA_RUNTIME_VERSION} -eq '8' ) { + $keystore = "-keystore", "${env:JAVA_HOME}/jre/lib/security/cacerts" + } else { + $keystore = "-cacerts" + } + & ${env:JAVA_HOME}/bin/keytool.exe $keystore -storepass 'changeit' -importcert -noprompt -alias cosmos_emulator -file $home/cosmosdbcert.cer + & ${env:JAVA_HOME}/bin/keytool.exe $keystore -storepass 'changeit' -list -alias cosmos_emulator - name: Setup and execute Gradle 'integrationTestCosmos' task uses: gradle/gradle-build-action@v2