diff --git a/.github/workflows/issue-tests.yml b/.github/workflows/issue-tests.yml index f4446db83f..bb02c13399 100644 --- a/.github/workflows/issue-tests.yml +++ b/.github/workflows/issue-tests.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - version: [2.23.1.0-b220, 2024.1.4.0-b108, 2024.2.1.0-b185, 2.20.9.0-b47, 2.25.0.0-b489] + version: [2.25.0.0-b489, 2024.1.4.0-b108, 2024.2.1.0-b185, 2.20.9.0-b47, 2.25.0.0-b489] env: YB_VERSION: ${{ matrix.version }} YB_CONN_STR: "postgres://yugabyte:yugabyte@127.0.0.1:5433/yugabyte" diff --git a/.github/workflows/misc-migtests.yml b/.github/workflows/misc-migtests.yml index fc939c42af..89001327ba 100644 --- a/.github/workflows/misc-migtests.yml +++ b/.github/workflows/misc-migtests.yml @@ -93,7 +93,7 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.RAHULB_S3_SECRET_ACCESS_KEY }} if: ${{ !cancelled() }} run: | - versions=("2024.2.1.0-b185" "2.20.9.0-b47" "2024.1.4.0-b108" "2.23.1.0-b220") + versions=("2024.2.1.0-b185" "2.20.9.0-b47" "2024.1.4.0-b108" "2.25.0.0-b489") for version in "${versions[@]}"; do echo "Running tests on version $version" diff --git a/.github/workflows/mysql-migtests.yml b/.github/workflows/mysql-migtests.yml index 7d39f8ec61..81542c8145 100644 --- a/.github/workflows/mysql-migtests.yml +++ b/.github/workflows/mysql-migtests.yml @@ -10,7 +10,7 @@ jobs: run-mysql-migration-tests: strategy: matrix: - version: [2024.2.1.0-b185, 2.20.9.0-b47, 2024.1.4.0-b108, 2.23.1.0-b220] + version: [2024.2.1.0-b185, 2.20.9.0-b47, 2024.1.4.0-b108, 2.25.0.0-b489] BETA_FAST_DATA_EXPORT: [0, 1] env: BETA_FAST_DATA_EXPORT: ${{ matrix.BETA_FAST_DATA_EXPORT }} diff --git a/.github/workflows/pg-13-migtests.yml b/.github/workflows/pg-13-migtests.yml index 2ae5e7ab17..8d6d8147b5 100644 --- a/.github/workflows/pg-13-migtests.yml +++ b/.github/workflows/pg-13-migtests.yml @@ -10,7 +10,7 @@ jobs: run-pg-13-migration-tests: strategy: matrix: - version: [2024.2.1.0-b185, 2.20.9.0-b47, 2024.1.4.0-b108, 2.23.1.0-b220] + version: [2024.2.1.0-b185, 2.20.9.0-b47, 2024.1.4.0-b108, 2.25.0.0-b489] BETA_FAST_DATA_EXPORT: [0, 1] test_group: - offline diff --git a/.github/workflows/pg-17-migtests.yml b/.github/workflows/pg-17-migtests.yml index 2a4a0450ed..91fe0a499a 100644 --- a/.github/workflows/pg-17-migtests.yml +++ b/.github/workflows/pg-17-migtests.yml @@ -10,7 +10,7 @@ jobs: run-pg-17-migration-tests: strategy: matrix: - version: [2024.2.1.0-b185, 2.20.9.0-b47, 2024.1.4.0-b108, 2.23.1.0-b220] + version: [2024.2.1.0-b185, 2.20.9.0-b47, 2024.1.4.0-b108, 2.25.0.0-b489] BETA_FAST_DATA_EXPORT: [0, 1] test_group: - offline diff --git a/migtests/tests/mysql/datatypes/mysql_data_types_automation.sql b/migtests/tests/mysql/datatypes/mysql_data_types_automation.sql index 150af21576..1ac64b37b6 100644 --- a/migtests/tests/mysql/datatypes/mysql_data_types_automation.sql +++ b/migtests/tests/mysql/datatypes/mysql_data_types_automation.sql @@ -22,7 +22,7 @@ insert into fixed_point_types values (0.987546789,0,12397.64563,1264.12); drop table if exists floating_point_types; create table if not exists floating_point_types(id int,float_type float, double_type double, real_type REAL); insert into floating_point_types values (1,0.456,0.12313,0.9); - insert into floating_point_types values (2,123456.456,0.1246533,1.9); +insert into floating_point_types values (2,123456.456,0.1246533,1.9); insert into floating_point_types values (3,0,0,0); insert into floating_point_types values (4,126.156,0.1,1.9999); diff --git a/migtests/tests/mysql/datatypes/validate b/migtests/tests/mysql/datatypes/validate index db3de06f14..876f8cec8f 100755 --- a/migtests/tests/mysql/datatypes/validate +++ b/migtests/tests/mysql/datatypes/validate @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import yb +import os def main(): yb.run_checks(migration_completed_checks) @@ -143,6 +144,11 @@ def migration_completed_checks(tgt): for table_name, row_count in EXPECTED_ROW_COUNT.items(): print(f"table_name: {table_name}, row_count: {got_row_count[table_name]}") assert row_count == got_row_count[table_name] + + tgtVersion = tgt.get_target_version() + + if "2.25" in tgtVersion and os.environ.get('BETA_FAST_DATA_EXPORT') == '1': + EXPECTED_SUM_OF_COLUMN['floating_point_types']['float_type'] = '123582.61200000001' for table_name, column_names_with_sum in EXPECTED_SUM_OF_COLUMN.items(): print(f"table_name: {table_name} ---- ") diff --git a/migtests/tests/pg/multiple-schemas/validate b/migtests/tests/pg/multiple-schemas/validate index 6222862036..0858b29064 100755 --- a/migtests/tests/pg/multiple-schemas/validate +++ b/migtests/tests/pg/multiple-schemas/validate @@ -2,6 +2,7 @@ import yb import common +import sys live_migration = 'false' def main(): @@ -145,16 +146,27 @@ def migration_completed_checks(tgt): "orafce", "pageinspect", "pg_buffercache", "pg_cron", "pg_freespacemap", "pg_hint_plan", "pg_prewarm", "pg_stat_monitor", "pg_stat_statements", "pg_trgm", "pg_visibility", "pgaudit", "pgcrypto", "pgrowlocks", "pgstattuple", "plpgsql", "postgres_fdw", "refint", "seg", "sslinfo", "tablefunc", "tcn", "timetravel", "tsm_system_rows", - "tsm_system_time", "unaccent", "uuid-ossp", "yb_pg_metrics", "yb_test_extension" ] + "tsm_system_time", "unaccent", "uuid-ossp", "yb_pg_metrics", "yb_test_extension", "vector" ] extensions = tgt.get_available_extensions() print(f"expected extensions: {expectedExtensions}") print(f"reported extensions: {extensions}") tgtVersion = tgt.get_target_version() print(f"target version: {tgtVersion}") - if "2.16" in tgtVersion: - expectedExtensions.remove("hll") + if "2.25" in tgtVersion: + expectedExtensions.remove("timetravel") + expectedExtensions.extend(["pg_partman", "pg_walinspect", "old_snapshot", "pgtap", "yb_ycql_utils", "pg_surgery", "yb_xcluster_ddl_replication"]) + if "2024.2" in tgtVersion: + expectedExtensions.extend(["pg_partman", "pgtap", "yb_ycql_utils", "yb_xcluster_ddl_replication"]) + if "2024.1" in tgtVersion: + expectedExtensions.extend(["yb_ycql_utils"]) for extension in expectedExtensions: assert extension in extensions, f"expected extension is not reported: {extension}" + + # Check for extra/unexpected extensions + extra_extensions = set(extensions) - set(expectedExtensions) + if extra_extensions: + print(f"ERROR: Unexpected extensions found: {extra_extensions}") + sys.exit(1) # Exit with error status def change_expected_values_for_live_migration(): del EXPECTED_ROW_COUNT["Mixed_Case_Table_Name_Test"]