master - NIX: Add CentOS 6.5 builds.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=fb2c6fffe15620...
Commit: fb2c6fffe15620e4c26e6a108ab2ff82b035a4b4
Parent: 31e8fa883d345d897d50abdcc880345116cfacd2
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Wed Jan 8 16:35:55 2014 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:52 2014 +0100
NIX: Add CentOS 6.5 builds.
---
release.nix | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/release.nix b/release.nix
index 5e4b3cf..0973bc2 100644
--- a/release.nix
+++ b/release.nix
@@ -42,7 +42,9 @@ let
rootmods = [ "virtio_pci" "virtio_blk" "virtio_balloon" "ext4" "unix"
"cifs" "virtio_net" "unix" "hmac" "md4" "ecb" "des_generic" "sha256" ];
- centos_url = ver: arch: "http://vault.centos.org/${ver}/os/${arch}/";
+ centos_url = ver: arch: if ver == "6.5"
+ then "http://ftp.fi.muni.cz/pub/linux/centos/${ver}/os/${arch}/"
+ else "http://vault.centos.org/${ver}/os/${arch}/";
fedora_url = ver: arch: if pkgs.lib.eqStrings ver "rawhide" || pkgs.lib.eqStrings ver "19"
then "ftp://ftp.fi.muni.cz/pub/linux/fedora/linux/development/${ver}/${arch}/os/"
else "mirror://fedora/linux/releases/${ver}/Everything/${arch}/os/";
@@ -114,6 +116,16 @@ let
version="6.4"; arch="i386";
sha="87aa4c4e19f9a3ec93e3d820f1ea6b6ece8810cb45f117a16354465e57a1b50d";
};
+
+ centos65i386 = centos {
+ version="6.5"; arch="i386";
+ sha="a89f27cc7d3cea431f3bd605a1e9309c32d5d409abc1b51a7b5c71c05f18a0c2";
+ };
+
+ centos65x86_64 = centos {
+ version="6.5"; arch="x86_64";
+ sha="3353e378f5cb4bb6c3b3dd2ca266c6d68a1e29c36cf99f76aea3d8e158626024";
+ };
};
vm = pkgs: xmods: with pkgs.lib; rec {
@@ -137,6 +149,7 @@ let
];
centos63 = [ "clusterlib-devel" "openaislib-devel" "cman" "libudev-devel" ];
centos64 = centos63;
+ centos65 = centos64;
fedora16 = [ "clusterlib-devel" "openaislib-devel" "cman" "systemd-devel" "libudev-devel" ];
fedora17 = [ "dlm-devel" "corosynclib-devel" "device-mapper-persistent-data"
"dlm" "systemd-devel" "perl-Digest-MD5" "libudev-devel" ];
@@ -150,7 +163,7 @@ let
mkRPM = { arch, image }: with pkgs.lib;
let use = vm (if eqStrings arch "i386" then pkgs.pkgsi686Linux else pkgs)
- (if eqStrings image "centos64" then [] else [ "9p" "9pnet_virtio" ]);
+ (if image == "centos64" || image == "centos65" then [] else [ "9p" "9pnet_virtio" ]);
in mkVM {
VM = use.rpmbuild;
diskFun = builtins.getAttr "${image}${arch}" use.imgs;
@@ -217,6 +230,8 @@ let
#centos63_x86_64 = mkRPM { arch = "x86_64" ; image = "centos63"; };
centos64_i386 = mkRPM { arch = "i386" ; image = "centos64"; };
centos64_x86_64 = mkRPM { arch = "x86_64" ; image = "centos64"; };
+ centos65_i386 = mkRPM { arch = "i386" ; image = "centos65"; };
+ centos65_x86_64 = mkRPM { arch = "x86_64" ; image = "centos65"; };
rawhide_i386 = mkRPM { arch = "i386" ; image = "rawhide"; };
rawhide_x86_64 = mkRPM { arch = "x86_64" ; image = "rawhide"; };
10 years, 1 month
master - NIX: Retire the CentOS 6.3 builds.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=31e8fa883d345d...
Commit: 31e8fa883d345d897d50abdcc880345116cfacd2
Parent: 55964cedcb1c58b5e258eb22ab99134d44c38678
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Wed Jan 8 16:35:39 2014 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:52 2014 +0100
NIX: Retire the CentOS 6.3 builds.
---
release.nix | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/release.nix b/release.nix
index a59ebb8..5e4b3cf 100644
--- a/release.nix
+++ b/release.nix
@@ -95,15 +95,15 @@ let
fedora18ux86_64 = update "18" "x86_64" fc18_64_updates pkgs.vmTools.rpmDistros.fedora18x86_64;
fedora18ui386 = update "18" "i386" fc18_32_updates pkgs.vmTools.rpmDistros.fedora18i386;
- centos63x86_64 = centos {
- version="6.3"; arch="x86_64";
- sha="4d3cddf382e81c20b167a8d13c7c92067040a1947dbb3c29cfafa01a74a26a2b";
- };
+ #centos63x86_64 = centos {
+ # version="6.3"; arch="x86_64";
+ # sha="4d3cddf382e81c20b167a8d13c7c92067040a1947dbb3c29cfafa01a74a26a2b";
+ #};
- centos63i386 = centos {
- version="6.3"; arch="i386";
- sha="5cee0e0c4d7e2dcb997f123ce9107dedbc424d80dd7f2b2471b3b348f3e1754c";
- };
+ #centos63i386 = centos {
+ # version="6.3"; arch="i386";
+ # sha="5cee0e0c4d7e2dcb997f123ce9107dedbc424d80dd7f2b2471b3b348f3e1754c";
+ #};
centos64x86_64 = centos {
version="6.4"; arch="x86_64";
@@ -213,8 +213,8 @@ let
fc19u_x86_64 = mkRPM { arch = "x86_64"; image = "fedora19u"; };
fc19u_i386 = mkRPM { arch = "i386"; image = "fedora19u"; };
- centos63_i386 = mkRPM { arch = "i386" ; image = "centos63"; };
- centos63_x86_64 = mkRPM { arch = "x86_64" ; image = "centos63"; };
+ #centos63_i386 = mkRPM { arch = "i386" ; image = "centos63"; };
+ #centos63_x86_64 = mkRPM { arch = "x86_64" ; image = "centos63"; };
centos64_i386 = mkRPM { arch = "i386" ; image = "centos64"; };
centos64_x86_64 = mkRPM { arch = "x86_64" ; image = "centos64"; };
10 years, 1 month
master - spec: We do want thin support on RHEL 6.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=cc6ed8fa66df4f...
Commit: cc6ed8fa66df4fba65a64b7111e26f5eb6b20162
Parent: 4d081f072fe5b6f96112196fbb52a9b5cda21c55
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Dec 17 15:23:08 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:52 2014 +0100
spec: We do want thin support on RHEL 6.
---
spec/source.inc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/spec/source.inc b/spec/source.inc
index 6a5b509..4b93be3 100644
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -33,6 +33,9 @@
%global req_udev udev >= 158-1
%global req_cluster openais >= 1.1.1-1, cman >= 3.0.6-1, corosync >= 1.2.0-1
+%endif
+
+%if %{fedora} == 16
%with thin none
%with thin_check
%with thin_repair
@@ -55,6 +58,7 @@
%if %{rhel} == 6
%define req_udev udev >= 147-2
+%global req_dm_persistent device-mapper-persistent-data >= 0.1.4
%endif
##############################################################
10 years, 1 month
master - spec: Do not treat --with-?=none as having the thing.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=4d081f072fe5b6...
Commit: 4d081f072fe5b6f96112196fbb52a9b5cda21c55
Parent: 581eeaf9502a530351a6894ce6d8f6930711e0b2
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Dec 17 10:14:28 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
spec: Do not treat --with-?=none as having the thing.
---
spec/macros.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/spec/macros.inc b/spec/macros.inc
index 4041086..7b841dd 100644
--- a/spec/macros.inc
+++ b/spec/macros.inc
@@ -18,7 +18,7 @@
%define with() \
%global configure_flags %(echo -n "%{?configure_flags} " | sed -e "s,--with-%1=[^ ]*,,"; test -n "%{?2}" && echo --with-%1=%2) \
-%global with_flags %(echo -n "%{?with_flags} " | sed -e "s,%1,,"; test -n "%{?2}" && echo %1)
+%global with_flags %(echo -n "%{?with_flags} " | sed -e "s,%1,,"; test -n "%{?2}" && test "%{?2}" != none && echo %1)
%global services monitor
%define service() \
10 years, 1 month
master - spec: Explicitly disable thin when we don't want it.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=581eeaf9502a53...
Commit: 581eeaf9502a530351a6894ce6d8f6930711e0b2
Parent: 9c8db4e33ff9f2baab14d6cf6bdd09cd411f3c3b
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Mon Dec 16 16:23:34 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
spec: Explicitly disable thin when we don't want it.
---
spec/source.inc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/spec/source.inc b/spec/source.inc
index 3da93ee..6a5b509 100644
--- a/spec/source.inc
+++ b/spec/source.inc
@@ -33,7 +33,7 @@
%global req_udev udev >= 158-1
%global req_cluster openais >= 1.1.1-1, cman >= 3.0.6-1, corosync >= 1.2.0-1
-%with thin
+%with thin none
%with thin_check
%with thin_repair
%with thin_dump
10 years, 1 month
master - NIX: Run system-wide tests separately, with RPMs installed.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=9c8db4e33ff9f2...
Commit: 9c8db4e33ff9f2baab14d6cf6bdd09cd411f3c3b
Parent: d567d0d307f0e4200dc4a5138ce4079cc1560092
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sun Dec 15 21:14:30 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Run system-wide tests separately, with RPMs installed.
---
release.nix | 29 ++++++++++++++++++-----------
1 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/release.nix b/release.nix
index 395b413..8fa4168 100644
--- a/release.nix
+++ b/release.nix
@@ -19,14 +19,23 @@ let
rpm -Uv ${pkgs.fetchurl {
url="ftp://ftp.isu.edu.tw/pub/Linux/Fedora/linux/updates/16/i386/lcov-1.9-2.fc16.noarch.rpm";
sha256 = "0ycdh5mb7p5ll76mqk0p6gpnjskvxxgh3a3bfr1crh94nvpwhp4z"; }}
+ dmesg -n 1 # avoid spilling dmesg into the main log, we capture it in harness
'';
postBuild = ''
- cp -R /tmp/test-results $out/test-results && \
- echo "report tests $out/test-results" >> $out/nix-support/hydra-build-products || \
- true
- cp -R /tmp/lcov $out/coverage && \
- echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products || \
- true # not really fatal, although kinda disappointing
+ cd `cat /tmp/build-location`
+ mv test/results/list test/results/list-rpm
+ rpm -Uvh /tmp/rpmout/RPMS/*/*.rpm # */
+ (/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || find / -name \*udevd) &
+ make check_system QUIET=1 T=${T} || touch $out/nix-support/failed
+ mv test/results/list test/results/list-system
+ cat test/results/list-* > test/results/list
+ cp -R test/results $out/test-results && \
+ echo "report tests $out/test-results" >> $out/nix-support/hydra-build-products || \
+ true
+ make lcov || true
+ cp -R lcov_reports $out/coverage && \
+ echo "report coverage $out/coverage" >> $out/nix-support/hydra-build-products || \
+ true # not really fatal, although kinda disappointing
'';
};
@@ -169,11 +178,9 @@ let
echo "%define check_commands \\";
echo "make lcov-reset \\";
echo "dmsetup targets\\";
- echo "dmesg --console-level debug || dmesg 8 || true\\";
- echo "(/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || find / -name \*udevd) & \\";
- echo "make check T=${T} || touch \$out/nix-support/failed \\"
- echo "cp -R test/results /tmp/test-results \\"
- echo "make lcov && cp -R lcov_reports /tmp/lcov") >> source.inc
+ echo "make check QUIET=1 T=${T} || touch \$out/nix-support/failed \\"
+ echo "pwd > /tmp/build-location \\"
+ echo "touch rpm-no-clean") >> source.inc
sed -e "s,\(device_mapper_version\) [0-9.]*$,\1 $version_dm," \
-e "s,^\(Version:[^0-9%]*\)[0-9.]*$,\1 $version," \
-e "s,^\(Release:[^0-9%]*\)[0-9.]\+,\1 0.HYDRA," \
10 years, 1 month
master - spec: Make it possible for %check_commands to prevent %clean-ing.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=d567d0d307f0e4...
Commit: d567d0d307f0e4200dc4a5138ce4079cc1560092
Parent: 00dee59702009db28ce34249c7fb287d2fe0ca3f
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sun Dec 15 21:12:06 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
spec: Make it possible for %check_commands to prevent %clean-ing.
---
spec/build.inc | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/spec/build.inc b/spec/build.inc
index fd455bb..95c9b83 100644
--- a/spec/build.inc
+++ b/spec/build.inc
@@ -45,4 +45,5 @@ test -e %{_sourcedir}/source.inc || cp source.inc build.inc packages.inc macros.
%{?check_commands}
%clean
-rm -rf $RPM_BUILD_ROOT
+pwd
+test -n rpm-no-clean || rm -rf $RPM_BUILD_ROOT
10 years, 1 month
master - NIX: Revert to calling make check inside the RPM build.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=00dee59702009d...
Commit: 00dee59702009db28ce34249c7fb287d2fe0ca3f
Parent: 13d5c78a8d5f09b91e26cd49fffa05313d2f6c82
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Sun Dec 15 17:29:08 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
NIX: Revert to calling make check inside the RPM build.
---
release.nix | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/release.nix b/release.nix
index 0f85493..395b413 100644
--- a/release.nix
+++ b/release.nix
@@ -171,7 +171,7 @@ let
echo "dmsetup targets\\";
echo "dmesg --console-level debug || dmesg 8 || true\\";
echo "(/usr/lib/systemd/systemd-udevd || /usr/lib/udev/udevd || find / -name \*udevd) & \\";
- echo "make check_full T=${T} || touch \$out/nix-support/failed \\"
+ echo "make check T=${T} || touch \$out/nix-support/failed \\"
echo "cp -R test/results /tmp/test-results \\"
echo "make lcov && cp -R lcov_reports /tmp/lcov") >> source.inc
sed -e "s,\(device_mapper_version\) [0-9.]*$,\1 $version_dm," \
10 years, 1 month
master - spec: Add lvm2-pvscan@.service to filelist.
by Petr Rockai
Gitweb: http://git.fedorahosted.org/git/?p=lvm2.git;a=commitdiff;h=13d5c78a8d5f09...
Commit: 13d5c78a8d5f09b91e26cd49fffa05313d2f6c82
Parent: 49ea253aafb518ce12b70637978372768737a168
Author: Petr Rockai <prockai(a)redhat.com>
AuthorDate: Tue Nov 19 09:24:17 2013 +0100
Committer: Petr Rockai <me(a)mornfall.net>
CommitterDate: Fri Feb 28 11:23:51 2014 +0100
spec: Add lvm2-pvscan@.service to filelist.
---
spec/packages.inc | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/spec/packages.inc b/spec/packages.inc
index 34dc130..4c00617 100644
--- a/spec/packages.inc
+++ b/spec/packages.inc
@@ -154,6 +154,7 @@ fi
%if %{have_service lvmetad}
%{_unitdir}/lvm2-lvmetad.socket
%{_unitdir}/lvm2-lvmetad.service
+ %{_unitdir}/lvm2-pvscan@.service
%{_unitdir}/blk-availability.service
%endif
%else
10 years, 1 month