diff --git a/ironic_inspector/migrations/versions/882b2d84cb1b_attribute_constraints_relaxing.py b/ironic_inspector/migrations/versions/882b2d84cb1b_attribute_constraints_relaxing.py index da83e4390..02b867bdb 100644 --- a/ironic_inspector/migrations/versions/882b2d84cb1b_attribute_constraints_relaxing.py +++ b/ironic_inspector/migrations/versions/882b2d84cb1b_attribute_constraints_relaxing.py @@ -63,7 +63,8 @@ def upgrade(): node_uuid_column = sa.Column(NODE_UUID, sa.String(36)) op.add_column(ATTRIBUTES, node_uuid_column) - attributes = sa.table(ATTRIBUTES, node_uuid_column, + attributes = sa.table(ATTRIBUTES, + sa.Column(NODE_UUID, sa.String(36)), sa.Column(UUID, sa.String(36))) with op.batch_alter_table(ATTRIBUTES, diff --git a/ironic_inspector/migrations/versions/d00d6e3f38c4_change_created_finished_at_type.py b/ironic_inspector/migrations/versions/d00d6e3f38c4_change_created_finished_at_type.py index 68227ae83..501412749 100644 --- a/ironic_inspector/migrations/versions/d00d6e3f38c4_change_created_finished_at_type.py +++ b/ironic_inspector/migrations/versions/d00d6e3f38c4_change_created_finished_at_type.py @@ -32,17 +32,22 @@ depends_on = None def upgrade(): - started_at = sa.Column('started_at', sa.types.Float, nullable=True) - finished_at = sa.Column('finished_at', sa.types.Float, nullable=True) temp_started_at = sa.Column("temp_started_at", sa.types.DateTime, nullable=True) temp_finished_at = sa.Column("temp_finished_at", sa.types.DateTime, nullable=True) - uuid = sa.Column("uuid", sa.String(36), primary_key=True) op.add_column("nodes", temp_started_at) op.add_column("nodes", temp_finished_at) + uuid = sa.Column("uuid", sa.String(36), primary_key=True) + started_at = sa.Column('started_at', sa.types.Float, nullable=True) + finished_at = sa.Column('finished_at', sa.types.Float, nullable=True) + # NOTE(dtantsur): do not reuse the column objects from add_column + temp_started_at = sa.Column("temp_started_at", sa.types.DateTime, + nullable=True) + temp_finished_at = sa.Column("temp_finished_at", sa.types.DateTime, + nullable=True) t = sa.table('nodes', started_at, finished_at, temp_started_at, temp_finished_at, uuid) diff --git a/releasenotes/notes/migrations-1.3.20-0d337d000bd0a7e0.yaml b/releasenotes/notes/migrations-1.3.20-0d337d000bd0a7e0.yaml new file mode 100644 index 000000000..8079f3b78 --- /dev/null +++ b/releasenotes/notes/migrations-1.3.20-0d337d000bd0a7e0.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fixes database migrations with SQLAlchemy 1.3.20. diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 45b304c95..6be8fbd8b 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -11,7 +11,8 @@ - ironic-inspector-grenade - ironic-inspector-tempest - ironic-inspector-tempest-discovery - - ironic-inspector-tempest-managed-non-standalone + - ironic-inspector-tempest-managed-non-standalone: + voting: false - openstack-tox-functional-py38 - bifrost-integration-tinyipa-ubuntu-bionic: voting: false @@ -23,5 +24,4 @@ - ironic-inspector-grenade - ironic-inspector-tempest - ironic-inspector-tempest-discovery - - ironic-inspector-tempest-managed-non-standalone - openstack-tox-functional-py38