From 1b16d5c8e47270cd313028a0578784e095d60bea Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 00:29:31 +0100 Subject: [PATCH 01/18] Fixing regex for source --- scripts/4_run_tests.sh | 9 ++++++++- ...__award_bonus.prc => R__ut3_demo.award_bonus.prc} | 0 source/award_bonus/award_bonus.xml | 2 +- .../{R__betwnstr.fnc => R__ut3_demo.betwnstr.fnc} | 0 source/between_string/between_string.xml | 2 +- ...name.prc => R__ut3_demo.remove_rooms_by_name.prc} | 0 source/remove_rooms_by_name/remove_rooms_by_name.xml | 2 +- ...award_bonus.pkb => ut3_demo.test_award_bonus.pkb} | 0 ..._award_bonus.pks => ut3_demotest_award_bonus.pks} | 0 ...{test_betwnstr.pkb => ut3_demo.test_betwnstr.pkb} | 0 ...{test_betwnstr.pks => ut3_demo.test_betwnstr.pks} | 0 test/install.sql | 12 ++++++------ ...me.pkb => ut3_demo.test_remove_rooms_by_name.pkb} | 0 ...me.pks => ut3_demo.test_remove_rooms_by_name.pks} | 0 14 files changed, 17 insertions(+), 10 deletions(-) rename source/award_bonus/{R__award_bonus.prc => R__ut3_demo.award_bonus.prc} (100%) rename source/between_string/{R__betwnstr.fnc => R__ut3_demo.betwnstr.fnc} (100%) rename source/remove_rooms_by_name/{R__remove_rooms_by_name.prc => R__ut3_demo.remove_rooms_by_name.prc} (100%) rename test/award_bonus/{test_award_bonus.pkb => ut3_demo.test_award_bonus.pkb} (100%) rename test/award_bonus/{test_award_bonus.pks => ut3_demotest_award_bonus.pks} (100%) rename test/between_string/{test_betwnstr.pkb => ut3_demo.test_betwnstr.pkb} (100%) rename test/between_string/{test_betwnstr.pks => ut3_demo.test_betwnstr.pks} (100%) rename test/remove_rooms_by_name/{test_remove_rooms_by_name.pkb => ut3_demo.test_remove_rooms_by_name.pkb} (100%) rename test/remove_rooms_by_name/{test_remove_rooms_by_name.pks => ut3_demo.test_remove_rooms_by_name.pks} (100%) diff --git a/scripts/4_run_tests.sh b/scripts/4_run_tests.sh index 4e89642..69a5ca2 100644 --- a/scripts/4_run_tests.sh +++ b/scripts/4_run_tests.sh @@ -3,7 +3,14 @@ set -ev utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE \ - -source_path=source -test_path=test \ + -source_path=source -regex_expression="/(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \ + -owner_subexpression=4 \ + -name_subexpression=5 \ + -type_subexpression=6 \ + -test_path=test -regex_expression="/(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \ + -owner_subexpression=3 \ + -name_subexpression=4 \ + -type_subexpression=5 \ -f=ut_documentation_reporter -c \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_sonar_test_reporter -o=test_results.xml \ diff --git a/source/award_bonus/R__award_bonus.prc b/source/award_bonus/R__ut3_demo.award_bonus.prc similarity index 100% rename from source/award_bonus/R__award_bonus.prc rename to source/award_bonus/R__ut3_demo.award_bonus.prc diff --git a/source/award_bonus/award_bonus.xml b/source/award_bonus/award_bonus.xml index 865bd10..926f36f 100644 --- a/source/award_bonus/award_bonus.xml +++ b/source/award_bonus/award_bonus.xml @@ -16,7 +16,7 @@ diff --git a/source/between_string/R__betwnstr.fnc b/source/between_string/R__ut3_demo.betwnstr.fnc similarity index 100% rename from source/between_string/R__betwnstr.fnc rename to source/between_string/R__ut3_demo.betwnstr.fnc diff --git a/source/between_string/between_string.xml b/source/between_string/between_string.xml index 238cd58..0c40237 100644 --- a/source/between_string/between_string.xml +++ b/source/between_string/between_string.xml @@ -8,7 +8,7 @@ diff --git a/source/remove_rooms_by_name/R__remove_rooms_by_name.prc b/source/remove_rooms_by_name/R__ut3_demo.remove_rooms_by_name.prc similarity index 100% rename from source/remove_rooms_by_name/R__remove_rooms_by_name.prc rename to source/remove_rooms_by_name/R__ut3_demo.remove_rooms_by_name.prc diff --git a/source/remove_rooms_by_name/remove_rooms_by_name.xml b/source/remove_rooms_by_name/remove_rooms_by_name.xml index 6d9a4c3..351fa71 100644 --- a/source/remove_rooms_by_name/remove_rooms_by_name.xml +++ b/source/remove_rooms_by_name/remove_rooms_by_name.xml @@ -16,7 +16,7 @@ diff --git a/test/award_bonus/test_award_bonus.pkb b/test/award_bonus/ut3_demo.test_award_bonus.pkb similarity index 100% rename from test/award_bonus/test_award_bonus.pkb rename to test/award_bonus/ut3_demo.test_award_bonus.pkb diff --git a/test/award_bonus/test_award_bonus.pks b/test/award_bonus/ut3_demotest_award_bonus.pks similarity index 100% rename from test/award_bonus/test_award_bonus.pks rename to test/award_bonus/ut3_demotest_award_bonus.pks diff --git a/test/between_string/test_betwnstr.pkb b/test/between_string/ut3_demo.test_betwnstr.pkb similarity index 100% rename from test/between_string/test_betwnstr.pkb rename to test/between_string/ut3_demo.test_betwnstr.pkb diff --git a/test/between_string/test_betwnstr.pks b/test/between_string/ut3_demo.test_betwnstr.pks similarity index 100% rename from test/between_string/test_betwnstr.pks rename to test/between_string/ut3_demo.test_betwnstr.pks diff --git a/test/install.sql b/test/install.sql index 0373f3f..9e43716 100644 --- a/test/install.sql +++ b/test/install.sql @@ -1,10 +1,10 @@ -@test/award_bonus/test_award_bonus.pks -@test/award_bonus/test_award_bonus.pkb +@test/award_bonus/ut3_demo.test_award_bonus.pks +@test/award_bonus/ut3_demo.test_award_bonus.pkb show errors -@test/between_string/test_betwnstr.pks -@test/between_string/test_betwnstr.pkb +@test/between_string/ut3_demo.test_betwnstr.pks +@test/between_string/ut3_demo.test_betwnstr.pkb show errors -@test/remove_rooms_by_name/test_remove_rooms_by_name.pks -@test/remove_rooms_by_name/test_remove_rooms_by_name.pkb +@test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pks +@test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pkb show errors exit \ No newline at end of file diff --git a/test/remove_rooms_by_name/test_remove_rooms_by_name.pkb b/test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pkb similarity index 100% rename from test/remove_rooms_by_name/test_remove_rooms_by_name.pkb rename to test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pkb diff --git a/test/remove_rooms_by_name/test_remove_rooms_by_name.pks b/test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pks similarity index 100% rename from test/remove_rooms_by_name/test_remove_rooms_by_name.pks rename to test/remove_rooms_by_name/ut3_demo.test_remove_rooms_by_name.pks From c4e6c06764b0f6524588f28a24107560ce095ff5 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 00:53:23 +0100 Subject: [PATCH 02/18] Updating docker details and versions --- .azure_templates/t-task-extend-create-docker-database.yml | 1 + utplsql-cicd-flyway-demo.yml | 4 ++-- utplsql-cicd-liquibase-demo.yml | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.azure_templates/t-task-extend-create-docker-database.yml b/.azure_templates/t-task-extend-create-docker-database.yml index c06ee10..f581bd5 100644 --- a/.azure_templates/t-task-extend-create-docker-database.yml +++ b/.azure_templates/t-task-extend-create-docker-database.yml @@ -28,6 +28,7 @@ steps: ${{ parameters.dockerOptions }} \ -p 1521:${{ parameters.dockerPortMap }} \ --network utplsql_network \ + -e "ORACLE_PASSWORD=oracle" \ ${{ parameters.dockerRepo }}:${{ parameters.oracleVersion }} # Wait for DB startup time docker logs -f ${{ parameters.dbname }} | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered diff --git a/utplsql-cicd-flyway-demo.yml b/utplsql-cicd-flyway-demo.yml index 78cc4f5..f609f21 100644 --- a/utplsql-cicd-flyway-demo.yml +++ b/utplsql-cicd-flyway-demo.yml @@ -14,9 +14,9 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: 'v3.1.8' + value: 'v3.1.9' - name : UTPLSQL_VERSION - value: 'v3.1.11' + value: 'v3.1.13' - name : DB_USER value: ut3_demo - name : DB_PASS diff --git a/utplsql-cicd-liquibase-demo.yml b/utplsql-cicd-liquibase-demo.yml index 3e9e5ee..908f454 100644 --- a/utplsql-cicd-liquibase-demo.yml +++ b/utplsql-cicd-liquibase-demo.yml @@ -14,9 +14,9 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: 'v3.1.8' + value: 'v3.1.9' - name : UTPLSQL_VERSION - value: 'v3.1.11' + value: 'v3.1.13' - name : DB_USER value: ut3_demo - name : DB_PASS From da489aebb56cf45ae34a7651a68bebfd7218eada Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 01:04:48 +0100 Subject: [PATCH 03/18] utplsqlcli missing v in tag in repo --- utplsql-cicd-flyway-demo.yml | 2 +- utplsql-cicd-liquibase-demo.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utplsql-cicd-flyway-demo.yml b/utplsql-cicd-flyway-demo.yml index f609f21..b086bb1 100644 --- a/utplsql-cicd-flyway-demo.yml +++ b/utplsql-cicd-flyway-demo.yml @@ -14,7 +14,7 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: 'v3.1.9' + value: '3.1.9' - name : UTPLSQL_VERSION value: 'v3.1.13' - name : DB_USER diff --git a/utplsql-cicd-liquibase-demo.yml b/utplsql-cicd-liquibase-demo.yml index 908f454..e92727e 100644 --- a/utplsql-cicd-liquibase-demo.yml +++ b/utplsql-cicd-liquibase-demo.yml @@ -14,7 +14,7 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: 'v3.1.9' + value: '3.1.9' - name : UTPLSQL_VERSION value: 'v3.1.13' - name : DB_USER From e305353cfbc2a2e4368ea9b27fb4437af9c06539 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 01:06:56 +0100 Subject: [PATCH 04/18] utplsqlcli missing v in tag in repo --- utplsql-cicd-flyway-demo.yml | 2 +- utplsql-cicd-liquibase-demo.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utplsql-cicd-flyway-demo.yml b/utplsql-cicd-flyway-demo.yml index b086bb1..de5c4a7 100644 --- a/utplsql-cicd-flyway-demo.yml +++ b/utplsql-cicd-flyway-demo.yml @@ -14,7 +14,7 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: '3.1.9' + value: 'v3.1.8' - name : UTPLSQL_VERSION value: 'v3.1.13' - name : DB_USER diff --git a/utplsql-cicd-liquibase-demo.yml b/utplsql-cicd-liquibase-demo.yml index e92727e..18d2cd0 100644 --- a/utplsql-cicd-liquibase-demo.yml +++ b/utplsql-cicd-liquibase-demo.yml @@ -14,7 +14,7 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: '3.1.9' + value: 'v3.1.8' - name : UTPLSQL_VERSION value: 'v3.1.13' - name : DB_USER From 799499cf9f0233abfd9d7cd5cdde38d66b7bf8d4 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 01:07:16 +0100 Subject: [PATCH 05/18] utplsqlcli missing v in tag in repo --- utplsql-cicd-flyway-demo.yml | 2 +- utplsql-cicd-liquibase-demo.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/utplsql-cicd-flyway-demo.yml b/utplsql-cicd-flyway-demo.yml index de5c4a7..b086bb1 100644 --- a/utplsql-cicd-flyway-demo.yml +++ b/utplsql-cicd-flyway-demo.yml @@ -14,7 +14,7 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: 'v3.1.8' + value: '3.1.9' - name : UTPLSQL_VERSION value: 'v3.1.13' - name : DB_USER diff --git a/utplsql-cicd-liquibase-demo.yml b/utplsql-cicd-liquibase-demo.yml index 18d2cd0..e92727e 100644 --- a/utplsql-cicd-liquibase-demo.yml +++ b/utplsql-cicd-liquibase-demo.yml @@ -14,7 +14,7 @@ variables: - name : UTPLSQL_CLI_DIR value: $(Build.BinariesDirectory)/utPLSQL-cli - name : UTPLSQL_CLI_VERSION - value: 'v3.1.8' + value: '3.1.9' - name : UTPLSQL_VERSION value: 'v3.1.13' - name : DB_USER From abab9d4b74d9175f4df30a84877d3d32a5ccb1a0 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 01:11:21 +0100 Subject: [PATCH 06/18] Typo while renaming project --- ...ut3_demotest_award_bonus.pks => ut3_demo.test_award_bonus.pks} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/award_bonus/{ut3_demotest_award_bonus.pks => ut3_demo.test_award_bonus.pks} (100%) diff --git a/test/award_bonus/ut3_demotest_award_bonus.pks b/test/award_bonus/ut3_demo.test_award_bonus.pks similarity index 100% rename from test/award_bonus/ut3_demotest_award_bonus.pks rename to test/award_bonus/ut3_demo.test_award_bonus.pks From a47b20f74b8e300eb2d6a60f459f98c7aaa96d78 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 01:17:57 +0100 Subject: [PATCH 07/18] Tests arecreated before tables --- utplsql-cicd-liquibase-demo.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/utplsql-cicd-liquibase-demo.yml b/utplsql-cicd-liquibase-demo.yml index e92727e..206dafb 100644 --- a/utplsql-cicd-liquibase-demo.yml +++ b/utplsql-cicd-liquibase-demo.yml @@ -66,17 +66,18 @@ extends: user: "sys" password: "oracle" script: "source/create_user.sql" - work_dir: "$(Build.SourcesDirectory)" - - displayName: "Install Tests" - user: "$(DB_USER)" - password: "$(DB_PASS)" - script: "test/install.sql" - work_dir: "$(Build.SourcesDirectory)" + work_dir: "$(Build.SourcesDirectory)" runliquibase: - work_dir: "$(Build.SourcesDirectory)" user: $(DB_USER) password: $(DB_PASS) masterchangelogfile: "utplsql_changelog.xml" + scripts: + - displayName: "Install Tests" + user: "$(DB_USER)" + password: "$(DB_PASS)" + script: "test/install.sql" + work_dir: "$(Build.SourcesDirectory)" gitCheckoutDetails: - gitRepo: ${{ variables.gitRepo }} branch: $(UTPLSQL_VERSION) From dae02b2e27308b7153827d6b7d09526d1c5a5cfe Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Sat, 16 Sep 2023 01:24:49 +0100 Subject: [PATCH 08/18] Update liquibase syntax --- .azure_templates/t-task-extend-sqlcl-liquibase.yml | 2 +- utplsql-cicd-liquibase-demo.yml | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.azure_templates/t-task-extend-sqlcl-liquibase.yml b/.azure_templates/t-task-extend-sqlcl-liquibase.yml index 24bf932..eebaee7 100644 --- a/.azure_templates/t-task-extend-sqlcl-liquibase.yml +++ b/.azure_templates/t-task-extend-sqlcl-liquibase.yml @@ -18,7 +18,7 @@ steps: #Issue with 19.3 docker images. fixed in 21 sql ${{ parameters.user }}/${{ parameters.password }}@//${{ parameters.connectionString }}?oracle.net.disableOob=true< Date: Thu, 21 Sep 2023 18:13:30 +0100 Subject: [PATCH 09/18] test path --- scripts/4_run_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/4_run_tests.sh b/scripts/4_run_tests.sh index 69a5ca2..1f6f30d 100644 --- a/scripts/4_run_tests.sh +++ b/scripts/4_run_tests.sh @@ -3,11 +3,11 @@ set -ev utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE \ - -source_path=source -regex_expression="/(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \ + -source_path=source -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \ -owner_subexpression=4 \ -name_subexpression=5 \ -type_subexpression=6 \ - -test_path=test -regex_expression="/(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \ + -test_path=test -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \ -owner_subexpression=3 \ -name_subexpression=4 \ -type_subexpression=5 \ From 00b110d9acd4838102976f1f0df08184c5567f3b Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 21 Sep 2023 20:49:13 +0100 Subject: [PATCH 10/18] Update file path --- source/install.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source/install.sql b/source/install.sql index 1ce808f..c20e15a 100644 --- a/source/install.sql +++ b/source/install.sql @@ -1,6 +1,6 @@ @source/award_bonus/V1.01__employees_test.sql -@source/award_bonus/R__award_bonus.prc -@source/between_string/R__betwnstr.fnc +@source/award_bonus/R__ut3_demo.award_bonus.prc +@source/between_string/R__ut3_demo.betwnstr.fnc @source/remove_rooms_by_name/V1.02__rooms.sql -@source/remove_rooms_by_name/R__remove_rooms_by_name.prc +@source/remove_rooms_by_name/R__ut3_demo.remove_rooms_by_name.prc exit \ No newline at end of file From 32ea854f642d0677d545d84eb01b2681f2e10845 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 21 Sep 2023 21:13:09 +0100 Subject: [PATCH 11/18] Update azure template --- .azure_templates/t-task-extend-utplsqlcli.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.azure_templates/t-task-extend-utplsqlcli.yml b/.azure_templates/t-task-extend-utplsqlcli.yml index 7b60f88..6eef82a 100644 --- a/.azure_templates/t-task-extend-utplsqlcli.yml +++ b/.azure_templates/t-task-extend-utplsqlcli.yml @@ -18,8 +18,16 @@ steps: - bash: | cd ${{ parameters.work_dir }} utplsql run ${{ parameters.test_user }}/${{ parameters.test_pwd }}@//${{ parameters.connectionString }}?oracle.net.disableOob=true \ - -source_path=${{ parameters.source_path }} \ + -source_path=${{ parameters.source_path }} \ + -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \ + -owner_subexpression=4 \ + -name_subexpression=5 \ + -type_subexpression=6 \ -test_path=${{ parameters.test_path }} \ + -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \ + -owner_subexpression=1 \ + -type_subexpression=5 \ + -name_subexpression=4 \ -f=ut_documentation_reporter -c \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_sonar_test_reporter -o=test_results.xml \ From 12d070e69af9ea5938077c4401714db2877f2843 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 21 Sep 2023 21:18:37 +0100 Subject: [PATCH 12/18] Updates --- .azure_templates/t-task-extend-utplsqlcli.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure_templates/t-task-extend-utplsqlcli.yml b/.azure_templates/t-task-extend-utplsqlcli.yml index 6eef82a..e55f9a1 100644 --- a/.azure_templates/t-task-extend-utplsqlcli.yml +++ b/.azure_templates/t-task-extend-utplsqlcli.yml @@ -18,16 +18,16 @@ steps: - bash: | cd ${{ parameters.work_dir }} utplsql run ${{ parameters.test_user }}/${{ parameters.test_pwd }}@//${{ parameters.connectionString }}?oracle.net.disableOob=true \ - -source_path=${{ parameters.source_path }} \ - -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \ - -owner_subexpression=4 \ - -name_subexpression=5 \ - -type_subexpression=6 \ + -source_path=${{ parameters.source_path }} \ + -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \ + -owner_subexpression=4 \ + -name_subexpression=5 \ + -type_subexpression=6 \ -test_path=${{ parameters.test_path }} \ - -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \ - -owner_subexpression=1 \ - -type_subexpression=5 \ - -name_subexpression=4 \ + -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \ + -owner_subexpression=1 \ + -type_subexpression=5 \ + -name_subexpression=4 \ -f=ut_documentation_reporter -c \ -f=ut_coverage_sonar_reporter -o=coverage.xml \ -f=ut_sonar_test_reporter -o=test_results.xml \ From 5491164549659ae760dad637ae5c1f74f769d7e6 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Thu, 21 Sep 2023 21:24:18 +0100 Subject: [PATCH 13/18] demo project update --- utlplsql-demo-project.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utlplsql-demo-project.yml b/utlplsql-demo-project.yml index dbf7a74..604af54 100644 --- a/utlplsql-demo-project.yml +++ b/utlplsql-demo-project.yml @@ -9,8 +9,8 @@ variables: SQLCL_DIR: $(Build.BinariesDirectory)/sqlcl UTPLSQL_DIR: $(Build.BinariesDirectory)/utPLSQL UTPLSQL_CLI_DIR: $(Build.BinariesDirectory)/utPLSQL-cli - UTPLSQL_CLI_VERSION: 'v3.1.8' - UTPLSQL_VERSION: 'v3.1.11' + UTPLSQL_CLI_VERSION: '3.1.9' + UTPLSQL_VERSION: 'v3.1.13' DOCKHER_HUB_REPO: 'gvenzl/oracle-xe' DB_USER: ut3_demo DB_PASS: ut3_demo @@ -20,8 +20,8 @@ jobs: displayName: Build utPLSQL-demo-project strategy: matrix: - Oracle19_2: - ORACLE_VERSION: "19c-se2-small" + Oracle21_slim: + ORACLE_VERSION: "21-slim" maxParallel: 2 steps: From 88b3719c223ecd948f1b488c9ecadc13f74d5e57 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 22 Sep 2023 13:01:32 +0100 Subject: [PATCH 14/18] hardocde to known working version without Exception in thread "main" java.lang.NoClassDefFoundError: com/fasterxml/jackson/databind/ObjectMapper at org.flywaydb.commandline.Main.main(Main.java:109) Caused by: java.lang.ClassNotFoundException: com.fasterxml.jackson.databind.ObjectMapper at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(Unknown Source) at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(Unknown Source) at java.base/java.lang.ClassLoader.loadClass(Unknown Source) --- .azure_templates/t-task-extend-flyway.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure_templates/t-task-extend-flyway.yml b/.azure_templates/t-task-extend-flyway.yml index c86f2f4..5fd302d 100644 --- a/.azure_templates/t-task-extend-flyway.yml +++ b/.azure_templates/t-task-extend-flyway.yml @@ -31,7 +31,7 @@ steps: -v ${{ parameters.config_dir }}:/flyway/conf \ -v ${{ parameters.driver_dir }}:/flyway/drivers \ --network utplsql_network \ - flyway/flyway migrate \ + flyway/flyway:8.5 migrate \ -url=jdbc:oracle:thin:@${{ parameters.jdbcConnectionString }} \ -configFiles="/flyway/conf/${{ parameters.config_file }}" \ -user="${{ parameters.user }}" \ From 4270fd3c85eb3824e56f2e918632d2b895aa4d0e Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 22 Sep 2023 17:37:54 +0100 Subject: [PATCH 15/18] Update demo project --- .azure_templates/t-extend-database-build.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.azure_templates/t-extend-database-build.yml b/.azure_templates/t-extend-database-build.yml index 4f3c02c..97cb226 100644 --- a/.azure_templates/t-extend-database-build.yml +++ b/.azure_templates/t-extend-database-build.yml @@ -54,15 +54,15 @@ steps: addBaseImageData: false - ${{ each trg_db in parameters.targetDatabases }}: - - bash: | - # download Oracle Database docker image from private repo and start the DB - time docker pull ${{ parameters.dockerRepo }}:${{ trg_db.oracleVersion }} - # start the docker container (DB) - time docker run -d --name ${{ trg_db.oracleVersion }} ${{ trg_db.dockerOptions }} -p 1521:${{ trg_db.dockerPortMap }} ${{ parameters.dockerRepo }}:${{ trg_db.oracleVersion }} - # Wait for DB startup - time docker logs -f ${{ trg_db.oracleVersion }} | grep -m 1 "DATABASE IS READY TO USE!" --line-buffered - displayName: 'Start Oracle DB Docker container: ${{ trg_db.oracleVersion }}' - + - template: t-task-extend-create-docker-database.yml + parameters: + containerRegistry: ${{ builddatabases.containerRegistry }} + dockerRepo: ${{ parameters.dockerRepo }} + dbname: ${{ trg_db.oracleVersion }} + oracleVersion: ${{ trg_db.oracleVersion }} + dockerOptions: ${{ trg_db.dockerOptions }} + dockerPortMap: ${{ trg_db.dockerPortMap }} + - ${{ each script in trg_db.scripts }}: - template: t-task-extend-sqlcl.yml parameters: From 4d86178dec677f79e012026ca9407638d4248cd5 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 22 Sep 2023 17:39:09 +0100 Subject: [PATCH 16/18] Update --- .azure_templates/t-extend-database-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure_templates/t-extend-database-build.yml b/.azure_templates/t-extend-database-build.yml index 97cb226..dccbca1 100644 --- a/.azure_templates/t-extend-database-build.yml +++ b/.azure_templates/t-extend-database-build.yml @@ -56,13 +56,13 @@ steps: - ${{ each trg_db in parameters.targetDatabases }}: - template: t-task-extend-create-docker-database.yml parameters: - containerRegistry: ${{ builddatabases.containerRegistry }} + containerRegistry: ${{ parameters.containerRegistry }} dockerRepo: ${{ parameters.dockerRepo }} dbname: ${{ trg_db.oracleVersion }} oracleVersion: ${{ trg_db.oracleVersion }} dockerOptions: ${{ trg_db.dockerOptions }} dockerPortMap: ${{ trg_db.dockerPortMap }} - + - ${{ each script in trg_db.scripts }}: - template: t-task-extend-sqlcl.yml parameters: From 637a802ee581cec35aef28a83006a54823971c71 Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 22 Sep 2023 18:01:46 +0100 Subject: [PATCH 17/18] Update demo project --- .github/workflows/build.yml | 4 ++-- scripts/1_install_utplsql.sh | 2 +- scripts/2_install_demo_project.sh | 4 ++-- scripts/3_install_tests.sh | 2 +- scripts/4_run_tests.sh | 15 ++++++++------- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 497f310..a19b2c3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - utplsql-version: [develop, v3.1.8, v3.1.11] + utplsql-version: [develop, v3.1.8, v3.1.13] services: oracle: @@ -45,7 +45,7 @@ jobs: run: echo Installing ${UTPLSQL_VERSION} && sh ${{ github.workspace }}/scripts/1_install_utplsql.sh - name: Install utPLSQL-cli - run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/v3.1.8/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli + run: curl -Lk -o utPLSQL-cli.zip "https://github.com/utPLSQL/utPLSQL-cli/releases/download/3.1.9/utPLSQL-cli.zip" && unzip utPLSQL-cli.zip && chmod -R u+x utPLSQL-cli - name: Install demo project run: sh ${{ github.workspace }}/scripts/2_install_demo_project.sh diff --git a/scripts/1_install_utplsql.sh b/scripts/1_install_utplsql.sh index 691ee88..041748e 100644 --- a/scripts/1_install_utplsql.sh +++ b/scripts/1_install_utplsql.sh @@ -1,4 +1,4 @@ git clone --depth=1 --branch=${UTPLSQL_VERSION} https://github.com/utPLSQL/utPLSQL.git utPLSQL chmod -R go+w $(pwd)/utPLSQL/source docker run --rm -v $(pwd)/utPLSQL:/utPLSQL -w /utPLSQL/source --network host \ - --entrypoint sqlplus gvenzl/oracle-xe:18-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users + --entrypoint sqlplus gvenzl/oracle-xe:21-slim sys/oracle@//127.0.0.1:1521/XE as sysdba @install_headless.sql UT3 UT3 users diff --git a/scripts/2_install_demo_project.sh b/scripts/2_install_demo_project.sh index c0f5da1..73de8c7 100644 --- a/scripts/2_install_demo_project.sh +++ b/scripts/2_install_demo_project.sh @@ -1,7 +1,7 @@ docker run --rm -v $(pwd):/work -w /work/ --network host \ - --entrypoint sqlplus gvenzl/oracle-xe:18-slim \ + --entrypoint sqlplus gvenzl/oracle-xe:21-slim \ sys/oracle@//127.0.0.1:1521/XE as sysdba @source/create_user.sql docker run --rm -v $(pwd):/work -w /work/ --network host \ - --entrypoint sqlplus gvenzl/oracle-xe:18-slim \ + --entrypoint sqlplus gvenzl/oracle-xe:21-slim \ ut3_demo/ut3_demo@//127.0.0.1:1521/XE @source/install.sql diff --git a/scripts/3_install_tests.sh b/scripts/3_install_tests.sh index e3bf4e5..99f305d 100644 --- a/scripts/3_install_tests.sh +++ b/scripts/3_install_tests.sh @@ -1,3 +1,3 @@ docker run --rm -v $(pwd):/work -w /work/ --network host \ - --entrypoint sqlplus gvenzl/oracle-xe:18-slim \ + --entrypoint sqlplus gvenzl/oracle-xe:21-slim \ ut3_demo/ut3_demo@//127.0.0.1:1521/XE @test/install.sql diff --git a/scripts/4_run_tests.sh b/scripts/4_run_tests.sh index 1f6f30d..59e9289 100644 --- a/scripts/4_run_tests.sh +++ b/scripts/4_run_tests.sh @@ -2,17 +2,18 @@ set -ev -utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE \ +utPLSQL-cli/bin/utplsql run ut3_demo/ut3_demo@//127.0.0.1:1521/XE?oracle.net.disableOob=true \ -source_path=source -regex_expression="(\w+)/(\w+)/(R__)(\w+)\.(\w+)\.(\w+)$" \ -owner_subexpression=4 \ -name_subexpression=5 \ -type_subexpression=6 \ -test_path=test -regex_expression="(\w+)/(\w+)/(\w+)\.(\w+)\.(\w+)$" \ - -owner_subexpression=3 \ - -name_subexpression=4 \ + -owner_subexpression=1 \ -type_subexpression=5 \ + -name_subexpression=4 \ -f=ut_documentation_reporter -c \ - -f=ut_coverage_sonar_reporter -o=coverage.xml \ - -f=ut_sonar_test_reporter -o=test_results.xml \ - --failure-exit-code=0 - + -f=ut_coverage_sonar_reporter -o=coverage.xml \ + -f=ut_sonar_test_reporter -o=test_results.xml \ + -f=ut_coverage_cobertura_reporter -o=cobertura.xml \ + -f=ut_junit_reporter -o=junit_test_results.xml \ + --failure-exit-code=0 \ No newline at end of file From 77d20136527ee64f620e5f2a1db92dc45a2f7aad Mon Sep 17 00:00:00 2001 From: Lukasz Wasylow Date: Fri, 22 Sep 2023 18:05:34 +0100 Subject: [PATCH 18/18] removing 3.1.8 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a19b2c3..2c1f402 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - utplsql-version: [develop, v3.1.8, v3.1.13] + utplsql-version: [develop, v3.1.13] services: oracle: