[Fai-commit] r6381 - in test-suite/scenarios: . setup-storage-tests/class setup-storage-tests/disk_config
Michael Tautschnig
mt at alioth.debian.org
Fri Apr 15 11:11:55 UTC 2011
Author: mt
Date: 2011-04-15 11:11:29 +0000 (Fri, 15 Apr 2011)
New Revision: 6381
Added:
test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_01
test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_02
test-suite/scenarios/setup-storage-tests/disk_config/JELLO__WASTE_ORG_01
test-suite/scenarios/setup-storage-tests/disk_config/MALORENT__ECHO_FR_01
test-suite/scenarios/setup-storage-tests/disk_config/MGOETZE__MGOETZE_NET_01
test-suite/scenarios/tests.txt
Modified:
test-suite/scenarios/setup-storage-tests/class/50-host-classes
Log:
several disk_config files as sent in by users and brief scenario configuration
Modified: test-suite/scenarios/setup-storage-tests/class/50-host-classes
===================================================================
--- test-suite/scenarios/setup-storage-tests/class/50-host-classes 2011-04-15 11:10:44 UTC (rev 6380)
+++ test-suite/scenarios/setup-storage-tests/class/50-host-classes 2011-04-15 11:11:29 UTC (rev 6381)
@@ -21,6 +21,12 @@
ifclass I386 && echo CENTOS5_32
ifclass AMD64 && echo CENTOS5_64
exit 0 ;; # CentOS does not use the GRUB class
+ sst01)
+ echo "FAIBASE DEBIAN DHCPC"
+ ifclass DSK_TEST_01 || echo DSK_TEST_01
+ ;;
+ sst02)
+ echo "FAIBASE DEBIAN DHCPC FREDRIK_ERIKSSON__AXIS_COM_01" ;;
*)
echo "FAIBASE DEBIAN DHCPC" ;;
esac
Added: test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_01
===================================================================
--- test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_01 (rev 0)
+++ test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_01 2011-04-15 11:11:29 UTC (rev 6381)
@@ -0,0 +1,13 @@
+disk_config disk1 bootable:1
+primary /boot 512 ext3 rw,errors=remount-ro
+primary - 0- - -
+
+disk_config lvm
+vg vg0 cciss/c0d0p2
+vg0-swap swap 2048 swap rw
+vg0-usr /usr 4096 ext3 rw
+vg0-var /var 4096 ext3 rw
+vg0-tmp /tmp 2048 ext3 rw
+vg0-home /home 2048 ext3 rw
+vg0-root / 4096 ext3 rw
+
Added: test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_02
===================================================================
--- test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_02 (rev 0)
+++ test-suite/scenarios/setup-storage-tests/disk_config/FREDRIK_ERIKSSON__AXIS_COM_02 2011-04-15 11:11:29 UTC (rev 6381)
@@ -0,0 +1,23 @@
+disk_config disk1 bootable:1
+primary - 522081K - -
+primary - 0- - -
+
+disk_config disk2 bootable:1
+primary - 522081K - -
+primary - 0- - -
+
+disk_config raid preserve_lazy:0,1 always_format:0
+raid1 /boot sda1,sdb1 ext4 rw,errors=remount-ro
+raid1 - sda2,sdb2 - -
+
+disk_config lvm preserve_lazy:vg0-home
+vg vg0 md1
+vg0-swap swap 4096 swap rw
+vg0-local /usr/local 10240 ext4 rw
+vg0-src /usr/src 10240 ext4 rw
+vg0-usr /usr 10240 ext4 rw
+vg0-var /var 10240 ext4 rw
+vg0-tmp /tmp 2048 ext4 rw
+vg0-home /home 97280 ext4 rw
+vg0-root / 4096 ext4 rw,errors=remount-ro
+
Added: test-suite/scenarios/setup-storage-tests/disk_config/JELLO__WASTE_ORG_01
===================================================================
--- test-suite/scenarios/setup-storage-tests/disk_config/JELLO__WASTE_ORG_01 (rev 0)
+++ test-suite/scenarios/setup-storage-tests/disk_config/JELLO__WASTE_ORG_01 2011-04-15 11:11:29 UTC (rev 6381)
@@ -0,0 +1,12 @@
+disk_config sda virtual
+primary - 0- - -
+#primary - 4096 - -
+
+disk_config sdb virtual
+primary - 0- - -
+#primary - 4096 - -
+
+disk_config raid
+raid1 / sda1,sdb1 ext4 rw,noatime createopts="-m 1"
+#raid1 swap sda2,sdb2 swap sw
+
Added: test-suite/scenarios/setup-storage-tests/disk_config/MALORENT__ECHO_FR_01
===================================================================
--- test-suite/scenarios/setup-storage-tests/disk_config/MALORENT__ECHO_FR_01 (rev 0)
+++ test-suite/scenarios/setup-storage-tests/disk_config/MALORENT__ECHO_FR_01 2011-04-15 11:11:29 UTC (rev 6381)
@@ -0,0 +1,28 @@
+##################################
+# NOW SPECIFIC CLASS DISK_CONFIG #
+##################################
+
+#
+# NEW FAI PARTITION SYSTEM
+#
+# Include LVM/RAID, Generic disk naming
+#
+# http://faiwiki.debian.net/index.php/Setup-storage
+#
+
+disk_config disk1 bootable:1
+primary /boot 100 ext3 rw
+primary swap 1G swap sw
+primary / 1G ext3 rw,errors=remount-ro
+logical /usr 1500 ext3 rw
+logical /var 1G ext3 rw
+logical /home 512 ext3 rw
+logical /tmp 1G ext3 rw
+logical - 4G- - -
+
+disk_config lvm
+#disk_config lvm preserve_lazy:HEBEX-KE,HEBEX-KE_LOGS
+vg HEBEX disk1.9
+HEBEX-KE /ke 1G- ext3 rw
+HEBEX-KE_LOGS /ke/logs 3G ext3 rw,noatime
+
Added: test-suite/scenarios/setup-storage-tests/disk_config/MGOETZE__MGOETZE_NET_01
===================================================================
--- test-suite/scenarios/setup-storage-tests/disk_config/MGOETZE__MGOETZE_NET_01 (rev 0)
+++ test-suite/scenarios/setup-storage-tests/disk_config/MGOETZE__MGOETZE_NET_01 2011-04-15 11:11:29 UTC (rev 6381)
@@ -0,0 +1,12 @@
+# example of new config file for setup-storage
+#
+# <type> <mountpoint> <size> <fs type> <mount options> <misc options>
+
+disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
+
+primary / 100% ext3 rw,errors=remount-ro
+
+disk_config disk2 disklabel:gpt fstabkey:uuid
+
+primary /data 100% ext3 rw
+
Added: test-suite/scenarios/tests.txt
===================================================================
--- test-suite/scenarios/tests.txt (rev 0)
+++ test-suite/scenarios/tests.txt 2011-04-15 11:11:29 UTC (rev 6381)
@@ -0,0 +1,3 @@
+svn://svn.debian.org/svn/fai/trunk/examples/simple atom01
+svn://svn.debian.org/svn/fai/test-suite/scenarios/setup-storage-tests sst01
+svn://svn.debian.org/svn/fai/test-suite/scenarios/setup-storage-tests sst02
More information about the Fai-commit
mailing list