Parametrizing Sonar Oracle DB SID

jgebal · jgebal · commit 6bcf8a4e711a · 2022-02-06T01:57:45.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,6 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       ORACLE_VERSION: ${{matrix.oracle-version}}
+      ORACLE_SID: ${{matrix.oracle-sid}}
       CONNECTION_STR: ${{matrix.connection-str}}
       ORACLE_PASSWORD: oracle
       DOCKER_VOLUME: ${{matrix.docker-volume}}
@@ -27,31 +28,38 @@ jobs:
       matrix:
         include:
           - oracle-version: "gvenzl/oracle-xe:11-full"
+            oracle-sid: 'XE'
             connection-str: '127.0.0.1:1521/XE'
             id: 1
             db_version_name: '11xe'
 # TODO - need to add healthcheck.sh into our containers
 #          - oracle-version: "utplsqlv3/oracledb:12c-r1-se2-small"
+#            oracle-sid: 'ORCLCDB'
 #            connection-str: '127.0.0.1:1521/ORCLCDB'
 #            id: 2
 #            db_version_name: '12.1se'
 #          - oracle-version: "utplsqlv3/oracledb:12c-r2-se2-small"
+#            oracle-sid: 'ORCLCDB'
 #            connection-str: '127.0.0.1:1521/ORCLCDB'
 #            id: 3
 #            db_version_name: '12.2se'
           - oracle-version: "gvenzl/oracle-xe:18-slim"
+            oracle-sid: 'XE'
             connection-str: '127.0.0.1:1521/XE'
             id: 4
             db_version_name: '18xe'
 #          - oracle-version: "utplsqlv3/oracledb:18c-se2-small"
+#            oracle-sid: 'ORCLCDB'
 #            connection-str: '127.0.0.1:1521/ORCLCDB'
 #            id: 5
 #            db_version_name: '18se'
 #          - oracle-version: "utplsqlv3/oracledb:19c-se2-small"
+#            oracle-sid: 'ORCLCDB'
 #            connection-str: '127.0.0.1:1521/ORCLCDB'
 #            id: 6
 #            db_version_name: '19se'
           - oracle-version: "gvenzl/oracle-xe:21-slim"
+            oracle-sid: 'XE'
             connection-str: '127.0.0.1:1521/XE'
             id: 7
             db_version_name: '21xe'
@@ -147,7 +155,7 @@ jobs:
         with:
           args: >
             -Dsonar.buildString=${{ format( '{0}.{1}', env.UTPLSQL_BUILD_VERSION, matrix.id ) }}
-            -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//oracle:1521/XE', env.CONNECTION_STR ) }}
+            -Dsonar.plsql.jdbc.url=${{ format( 'jdbc:oracle:thin:@//oracle:1521/{0}', env.ORACLE_SID ) }}
             -Dsonar.plsql.jdbc.driver.path=${{ format( '{0}/ojdbc8.jar', env.OJDBC_HOME ) }}
 
   publish:
