Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Jelle van der Waa
Archweb
Commits
35512840
Unverified
Commit
35512840
authored
Jun 16, 2018
by
Jelle van der Waa
🚧
Committed by
GitHub
Jun 16, 2018
Browse files
Merge pull request #122 from jelly/cleanup_releng_model
releng: remove old fixtures and add missing migration
parents
5839416f
30583255
Changes
11
Hide whitespace changes
Inline
Side-by-side
releng/fixtures/architecture.json
deleted
100644 → 0
View file @
5839416f
[
{
"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"
}
}
]
releng/fixtures/bootloaders.json
deleted
100644 → 0
View file @
5839416f
[
{
"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"
}
}
]
releng/fixtures/boottype.json
deleted
100644 → 0
View file @
5839416f
[
{
"pk"
:
1
,
"model"
:
"releng.boottype"
,
"fields"
:
{
"name"
:
"optical"
}
},
{
"pk"
:
2
,
"model"
:
"releng.boottype"
,
"fields"
:
{
"name"
:
"usb"
}
},
{
"pk"
:
3
,
"model"
:
"releng.boottype"
,
"fields"
:
{
"name"
:
"pxe"
}
}
]
releng/fixtures/clockchoices.json
deleted
100644 → 0
View file @
5839416f
[
{
"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)"
}
}
]
releng/fixtures/filesystems.json
deleted
100644 → 0
View file @
5839416f
[
{
"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"
}
}
]
releng/fixtures/hardware.json
deleted
100644 → 0
View file @
5839416f
[
{
"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"
}
}
]
releng/fixtures/installtype.json
deleted
100644 → 0
View file @
5839416f
[
{
"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)"
}
}
]
releng/fixtures/isotypes.json
deleted
100644 → 0
View file @
5839416f
[
{
"pk"
:
1
,
"model"
:
"releng.isotype"
,
"fields"
:
{
"name"
:
"core"
}
},
{
"pk"
:
2
,
"model"
:
"releng.isotype"
,
"fields"
:
{
"name"
:
"net"
}
}
]
releng/fixtures/modules.json
deleted
100644 → 0
View file @
5839416f
[
{
"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"
}
}
]
releng/fixtures/source.json
deleted
100644 → 0
View file @
5839416f
[
{
"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"
}
}
]
releng/migrations/0005_auto_20180616_0947.py
0 → 100644
View file @
35512840
# -*- 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'
,
),
]
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment