diff --git a/awx/main/migrations/0206_jobhostsummary_host_id_idx.py b/awx/main/migrations/0206_jobhostsummary_host_id_idx.py index 8607bc92f6..5ae7956682 100644 --- a/awx/main/migrations/0206_jobhostsummary_host_id_idx.py +++ b/awx/main/migrations/0206_jobhostsummary_host_id_idx.py @@ -3,7 +3,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0205_add_ordering_to_instancegroup_and_workflow_nodes'), + ('main', '0203_remove_team_of_teams'), ] operations = [ diff --git a/awx/main/migrations/0207_merge_0205_0206.py b/awx/main/migrations/0207_merge_0205_0206.py new file mode 100644 index 0000000000..3dc111bc39 --- /dev/null +++ b/awx/main/migrations/0207_merge_0205_0206.py @@ -0,0 +1,10 @@ +from django.db import migrations + + +class Migration(migrations.Migration): + dependencies = [ + ('main', '0205_add_ordering_to_instancegroup_and_workflow_nodes'), + ('main', '0206_jobhostsummary_host_id_idx'), + ] + + operations = [] diff --git a/awx/main/migrations/0207_alter_skip_tags_to_textfield.py b/awx/main/migrations/0208_alter_skip_tags_to_textfield.py similarity index 90% rename from awx/main/migrations/0207_alter_skip_tags_to_textfield.py rename to awx/main/migrations/0208_alter_skip_tags_to_textfield.py index 9624b29d8f..da386f4bf2 100644 --- a/awx/main/migrations/0207_alter_skip_tags_to_textfield.py +++ b/awx/main/migrations/0208_alter_skip_tags_to_textfield.py @@ -5,7 +5,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0206_jobhostsummary_host_id_idx'), + ('main', '0207_merge_0205_0206'), ] operations = [ diff --git a/awx/main/migrations/0208_fix_system_auditor_migration.py b/awx/main/migrations/0209_fix_system_auditor_migration.py similarity index 96% rename from awx/main/migrations/0208_fix_system_auditor_migration.py rename to awx/main/migrations/0209_fix_system_auditor_migration.py index cfb207a016..c9a122eee9 100644 --- a/awx/main/migrations/0208_fix_system_auditor_migration.py +++ b/awx/main/migrations/0209_fix_system_auditor_migration.py @@ -37,7 +37,7 @@ def fix_system_auditor_assignments(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('main', '0207_alter_skip_tags_to_textfield'), + ('main', '0208_alter_skip_tags_to_textfield'), ] operations = [ diff --git a/awx/main/tests/functional/test_migrations.py b/awx/main/tests/functional/test_migrations.py index e6a09ae3a5..7bb25d4fc5 100644 --- a/awx/main/tests/functional/test_migrations.py +++ b/awx/main/tests/functional/test_migrations.py @@ -251,7 +251,7 @@ class TestSystemAuditorMigration: def test_fix_system_auditor_migration_backfills_missing(self, migrator): """ - Migration 0208 should backfill Platform Auditor for any + Migration 0209 should backfill Platform Auditor for any system_auditor members who were missed by the original migration. """ state = migrator.apply_initial_migration(('main', '0190_alter_inventorysource_source_and_more')) @@ -273,7 +273,7 @@ class TestSystemAuditorMigration: "Setup: user should not have Platform Auditor before corrective migration" ) - state = migrator.apply_tested_migration(('main', '0208_fix_system_auditor_migration')) + state = migrator.apply_tested_migration(('main', '0209_fix_system_auditor_migration')) RoleUserAssignment = state.apps.get_model('dab_rbac', 'RoleUserAssignment') assert RoleUserAssignment.objects.filter(user=user.id, role_definition__name='Platform Auditor').exists(), ( @@ -282,7 +282,7 @@ class TestSystemAuditorMigration: def test_fix_system_auditor_migration_no_duplicates(self, migrator): """ - Migration 0208 must be idempotent — users who already have + Migration 0209 must be idempotent — users who already have Platform Auditor should not receive a duplicate assignment. """ state = migrator.apply_initial_migration(('main', '0190_alter_inventorysource_source_and_more')) @@ -299,7 +299,7 @@ class TestSystemAuditorMigration: # Confirm the user already has the assignment (from the fixed 0192) assert RoleUserAssignment.objects.filter(user=user.id, role_definition__name='Platform Auditor').exists() - state = migrator.apply_tested_migration(('main', '0208_fix_system_auditor_migration')) + state = migrator.apply_tested_migration(('main', '0209_fix_system_auditor_migration')) RoleUserAssignment = state.apps.get_model('dab_rbac', 'RoleUserAssignment') assert RoleUserAssignment.objects.filter(user=user.id, role_definition__name='Platform Auditor').count() == 1, (