From 30583255d6260e2df70bfeff0b50819e6e0652bc Mon Sep 17 00:00:00 2001 From: Jelle van der Waa Date: Sat, 16 Jun 2018 12:04:40 +0200 Subject: [PATCH] releng: remove old fixtures and add missing migration Add missing migration which removes the old releng models and remove the old json fixtures. --- releng/fixtures/architecture.json | 30 ------ releng/fixtures/bootloaders.json | 23 ----- releng/fixtures/boottype.json | 23 ----- releng/fixtures/clockchoices.json | 72 ------------- releng/fixtures/filesystems.json | 23 ----- releng/fixtures/hardware.json | 44 -------- releng/fixtures/installtype.json | 30 ------ releng/fixtures/isotypes.json | 16 --- releng/fixtures/modules.json | 86 ---------------- releng/fixtures/source.json | 23 ----- releng/migrations/0005_auto_20180616_0947.py | 103 +++++++++++++++++++ 11 files changed, 103 insertions(+), 370 deletions(-) delete mode 100644 releng/fixtures/architecture.json delete mode 100644 releng/fixtures/bootloaders.json delete mode 100644 releng/fixtures/boottype.json delete mode 100644 releng/fixtures/clockchoices.json delete mode 100644 releng/fixtures/filesystems.json delete mode 100644 releng/fixtures/hardware.json delete mode 100644 releng/fixtures/installtype.json delete mode 100644 releng/fixtures/isotypes.json delete mode 100644 releng/fixtures/modules.json delete mode 100644 releng/fixtures/source.json create mode 100644 releng/migrations/0005_auto_20180616_0947.py diff --git a/releng/fixtures/architecture.json b/releng/fixtures/architecture.json deleted file mode 100644 index 0bf9b8bf..00000000 --- a/releng/fixtures/architecture.json +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.architecture", - "fields": { - "name": "dual, option i686" - } - }, - { - "pk": 2, - "model": "releng.architecture", - "fields": { - "name": "dual, option x86_64" - } - }, - { - "pk": 3, - "model": "releng.architecture", - "fields": { - "name": "i686" - } - }, - { - "pk": 4, - "model": "releng.architecture", - "fields": { - "name": "x86_64" - } - } -] diff --git a/releng/fixtures/bootloaders.json b/releng/fixtures/bootloaders.json deleted file mode 100644 index bee02f2b..00000000 --- a/releng/fixtures/bootloaders.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.bootloader", - "fields": { - "name": "grub" - } - }, - { - "pk": 2, - "model": "releng.bootloader", - "fields": { - "name": "syslinux" - } - }, - { - "pk": 3, - "model": "releng.bootloader", - "fields": { - "name": "other/manual" - } - } -] diff --git a/releng/fixtures/boottype.json b/releng/fixtures/boottype.json deleted file mode 100644 index ed4636eb..00000000 --- a/releng/fixtures/boottype.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.boottype", - "fields": { - "name": "optical" - } - }, - { - "pk": 2, - "model": "releng.boottype", - "fields": { - "name": "usb" - } - }, - { - "pk": 3, - "model": "releng.boottype", - "fields": { - "name": "pxe" - } - } -] diff --git a/releng/fixtures/clockchoices.json b/releng/fixtures/clockchoices.json deleted file mode 100644 index d2d4eb80..00000000 --- a/releng/fixtures/clockchoices.json +++ /dev/null @@ -1,72 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.clockchoice", - "fields": { - "name": "default region/timezone, keep clock" - } - }, - { - "pk": 2, - "model": "releng.clockchoice", - "fields": { - "name": "default region/timezone, change clock manually (UTC)" - } - }, - { - "pk": 3, - "model": "releng.clockchoice", - "fields": { - "name": "default region/timezone, change clock with NTP (UTC)" - } - }, - { - "pk": 4, - "model": "releng.clockchoice", - "fields": { - "name": "default region/timezone, change clock manually (localtime)" - } - }, - { - "pk": 5, - "model": "releng.clockchoice", - "fields": { - "name": "default region/timezone, change clock with NTP (localtime)" - } - }, - { - "pk": 6, - "model": "releng.clockchoice", - "fields": { - "name": "update region/timezone, keep clock" - } - }, - { - "pk": 7, - "model": "releng.clockchoice", - "fields": { - "name": "update region/timezone, change clock manually (UTC)" - } - }, - { - "pk": 8, - "model": "releng.clockchoice", - "fields": { - "name": "update region/timezone, change clock with NTP (UTC)" - } - }, - { - "pk": 9, - "model": "releng.clockchoice", - "fields": { - "name": "update region/timezone, change clock manually (localtime)" - } - }, - { - "pk": 10, - "model": "releng.clockchoice", - "fields": { - "name": "update region/timezone, change clock with NTP (localtime)" - } - } -] diff --git a/releng/fixtures/filesystems.json b/releng/fixtures/filesystems.json deleted file mode 100644 index 208f5c73..00000000 --- a/releng/fixtures/filesystems.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.filesystem", - "fields": { - "name": "autoprepare" - } - }, - { - "pk": 2, - "model": "releng.filesystem", - "fields": { - "name": "manual" - } - }, - { - "pk": 3, - "model": "releng.filesystem", - "fields": { - "name": "from config file" - } - } -] diff --git a/releng/fixtures/hardware.json b/releng/fixtures/hardware.json deleted file mode 100644 index a2bb9ec0..00000000 --- a/releng/fixtures/hardware.json +++ /dev/null @@ -1,44 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.hardwaretype", - "fields": { - "name": "virtualbox" - } - }, - { - "pk": 2, - "model": "releng.hardwaretype", - "fields": { - "name": "qemu" - } - }, - { - "pk": 3, - "model": "releng.hardwaretype", - "fields": { - "name": "intel i686" - } - }, - { - "pk": 4, - "model": "releng.hardwaretype", - "fields": { - "name": "intel x86_64" - } - }, - { - "pk": 5, - "model": "releng.hardwaretype", - "fields": { - "name": "amd i686" - } - }, - { - "pk": 6, - "model": "releng.hardwaretype", - "fields": { - "name": "amd x86_64" - } - } -] diff --git a/releng/fixtures/installtype.json b/releng/fixtures/installtype.json deleted file mode 100644 index 07d17f28..00000000 --- a/releng/fixtures/installtype.json +++ /dev/null @@ -1,30 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.installtype", - "fields": { - "name": "interactive install" - } - }, - { - "pk": 2, - "model": "releng.installtype", - "fields": { - "name": "automatic install generic example" - } - }, - { - "pk": 3, - "model": "releng.installtype", - "fields": { - "name": "automatic install fancy example" - } - }, - { - "pk": 4, - "model": "releng.installtype", - "fields": { - "name": "automatic install custom config (if special, specify in comments)" - } - } -] diff --git a/releng/fixtures/isotypes.json b/releng/fixtures/isotypes.json deleted file mode 100644 index a529b181..00000000 --- a/releng/fixtures/isotypes.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.isotype", - "fields": { - "name": "core" - } - }, - { - "pk": 2, - "model": "releng.isotype", - "fields": { - "name": "net" - } - } -] diff --git a/releng/fixtures/modules.json b/releng/fixtures/modules.json deleted file mode 100644 index 9cdf1a8d..00000000 --- a/releng/fixtures/modules.json +++ /dev/null @@ -1,86 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.module", - "fields": { - "name": "lvm2" - } - }, - { - "pk": 2, - "model": "releng.module", - "fields": { - "name": "dm_crypt" - } - }, - { - "pk": 3, - "model": "releng.module", - "fields": { - "name": "softraid" - } - }, - { - "pk": 4, - "model": "releng.module", - "fields": { - "name": "nilfs2" - } - }, - { - "pk": 5, - "model": "releng.module", - "fields": { - "name": "btrfs" - } - }, - { - "pk": 6, - "model": "releng.module", - "fields": { - "name": "ext2" - } - }, - { - "pk": 7, - "model": "releng.module", - "fields": { - "name": "ext3" - } - }, - { - "pk": 8, - "model": "releng.module", - "fields": { - "name": "ext4" - } - }, - { - "pk": 9, - "model": "releng.module", - "fields": { - "name": "swap" - } - }, - { - "pk": 10, - "model": "releng.module", - "fields": { - "name": "xfs" - } - }, - { - "pk": 11, - "model": "releng.module", - "fields": { - "name": "jfs" - } - }, - { - "pk": 12, - "model": "releng.module", - "fields": { - "name": "reiserFS" - } - } -] diff --git a/releng/fixtures/source.json b/releng/fixtures/source.json deleted file mode 100644 index 9d1950a5..00000000 --- a/releng/fixtures/source.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "pk": 1, - "model": "releng.source", - "fields": { - "name": "net install manual networking config (verify network, rc.conf, resolv.conf, mirrorlist)" - } - }, - { - "pk": 2, - "model": "releng.source", - "fields": { - "name": "net install dhcp (verify network, rc.conf, mirrorlist)" - } - }, - { - "pk": 3, - "model": "releng.source", - "fields": { - "name": "core" - } - } -] diff --git a/releng/migrations/0005_auto_20180616_0947.py b/releng/migrations/0005_auto_20180616_0947.py new file mode 100644 index 00000000..830d311e --- /dev/null +++ b/releng/migrations/0005_auto_20180616_0947.py @@ -0,0 +1,103 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.13 on 2018-06-16 09:47 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('releng', '0004_auto_20170524_0704'), + ] + + operations = [ + migrations.RemoveField( + model_name='test', + name='architecture', + ), + migrations.RemoveField( + model_name='test', + name='boot_type', + ), + migrations.RemoveField( + model_name='test', + name='bootloader', + ), + migrations.RemoveField( + model_name='test', + name='clock_choice', + ), + migrations.RemoveField( + model_name='test', + name='filesystem', + ), + migrations.RemoveField( + model_name='test', + name='hardware_type', + ), + migrations.RemoveField( + model_name='test', + name='install_type', + ), + migrations.RemoveField( + model_name='test', + name='iso', + ), + migrations.RemoveField( + model_name='test', + name='iso_type', + ), + migrations.RemoveField( + model_name='test', + name='modules', + ), + migrations.RemoveField( + model_name='test', + name='rollback_filesystem', + ), + migrations.RemoveField( + model_name='test', + name='rollback_modules', + ), + migrations.RemoveField( + model_name='test', + name='source', + ), + migrations.DeleteModel( + name='Architecture', + ), + migrations.DeleteModel( + name='Bootloader', + ), + migrations.DeleteModel( + name='BootType', + ), + migrations.DeleteModel( + name='ClockChoice', + ), + migrations.DeleteModel( + name='Filesystem', + ), + migrations.DeleteModel( + name='HardwareType', + ), + migrations.DeleteModel( + name='InstallType', + ), + migrations.DeleteModel( + name='Iso', + ), + migrations.DeleteModel( + name='IsoType', + ), + migrations.DeleteModel( + name='Module', + ), + migrations.DeleteModel( + name='Source', + ), + migrations.DeleteModel( + name='Test', + ), + ]