Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Mysql CI #246

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "CI"
concurrency: # Cancel any existing runs of this workflow for this same PR
concurrency: # Cancel any existing runs of this workflow for this same PR
group: "${{ github.workflow }}-${{ github.ref }}"
cancel-in-progress: true
on: # yamllint disable-line rule:truthy rule:comments
Expand Down
1 change: 1 addition & 0 deletions changes/246.housekeeping
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix Mysql CI setup
1 change: 0 additions & 1 deletion development/docker-compose.mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ services:
db:
image: "mysql:8"
command:
- "--default-authentication-plugin=mysql_native_password"
- "--max_connections=1000"
env_file:
- "development.env"
Expand Down
8 changes: 5 additions & 3 deletions nautobot_firewall_models/tests/fixtures.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
"""Create basic objects for use in test class setup."""

# flake8: noqa: F403,405
from django.contrib.contenttypes.models import ContentType
from nautobot.dcim.models import Device, DeviceType, Manufacturer, Platform, Location, LocationType
Expand All @@ -14,9 +15,10 @@
def create_ip_range():
"""Creates 3 IPRange objects."""
status = Status.objects.get(name="Active")
vrf, _ = VRF.objects.get_or_create(name="random_vrf")
IPRange.objects.get_or_create(start_address="192.168.0.1", end_address="192.168.0.10", vrf=None, status=status)
IPRange.objects.get_or_create(start_address="192.168.0.1", end_address="192.168.0.10", vrf=vrf, status=status)
vrf1, _ = VRF.objects.get_or_create(name="random_vrf", rd="random_rd")
vrf2, _ = VRF.objects.get_or_create(name="another_random_vrf", rd="another_random_rd")
IPRange.objects.get_or_create(start_address="192.168.0.1", end_address="192.168.0.10", vrf=vrf1, status=status)
IPRange.objects.get_or_create(start_address="192.168.0.1", end_address="192.168.0.10", vrf=vrf2, status=status)
return IPRange.objects.get_or_create(start_address="192.168.0.11", end_address="192.168.0.20", status=status)[0]


Expand Down
Loading