From 5b4bca86f011c46ab2f7ba9cee66f9135463f72c Mon Sep 17 00:00:00 2001 From: ertaozh Date: Fri, 11 May 2018 04:22:02 -0400 Subject: [PATCH 1/5] Add back ntp-wait for building genesis-base on pegas --- xCAT-genesis-builder/buildrpm | 1 - 1 file changed, 1 deletion(-) diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm index c4fb822a0..0aed251d1 100755 --- a/xCAT-genesis-builder/buildrpm +++ b/xCAT-genesis-builder/buildrpm @@ -133,7 +133,6 @@ elif [ $BUILDARCH = "ppc64" ]; then sed -i 's/ mkreiserfs//' $DRACUTMODDIR/install sed -i 's/ reiserfstune//' $DRACUTMODDIR/install sed -i 's/ vconfig//' $DRACUTMODDIR/install - sed -i 's/ ntp-wait//' $DRACUTMODDIR/install fi sed -i 's/ efibootmgr//' $DRACUTMODDIR/install sed -i 's/ dmidecode//' $DRACUTMODDIR/install From 615b6895d04203c2327185bc2182cb4e9a09209b Mon Sep 17 00:00:00 2001 From: ertaozh Date: Wed, 16 May 2018 04:01:43 -0400 Subject: [PATCH 2/5] Modify install xCAT case to do file checking for xcat-genesis-base --- xCAT-test/autotest/testcase/install_xCAT/case0 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/xCAT-test/autotest/testcase/install_xCAT/case0 b/xCAT-test/autotest/testcase/install_xCAT/case0 index 05bc1f7c7..bab013f6b 100644 --- a/xCAT-test/autotest/testcase/install_xCAT/case0 +++ b/xCAT-test/autotest/testcase/install_xCAT/case0 @@ -18,6 +18,10 @@ check:output=~Version cmd:service xcatd status check:rc==0 check:output=~running +cmd:rpm -ql xCAT-genesis-base-x86_64 |grep ntp-wait +check:rc==0 +cmd:rpm -ql xCAT-genesis-base-ppc64 |grep ntp-wait +check:rc==0 cmd:rm -rf /install_xCAT_xcat-core.tar.bz2 /install_xCAT_xcat-dep.tar.bz2 end @@ -43,6 +47,10 @@ check:output=~Version cmd:service xcatd status check:rc==0 check:output=~running +cmd:dpkg -L xcat-genesis-base-ppc64 |grep ntp-wait +check:rc==0 +cmd:dpkg -L xcat-genesis-base-amd64 |grep ntp-wait +check:rc==0 cmd:rm -rf /install_xCAT_xcat-core.tar.bz2 /install_xCAT_xcat-dep.tar.bz2 end From a1ce7873188dbe484dca8ed447a27dffe0ea84ad Mon Sep 17 00:00:00 2001 From: ertaozh Date: Thu, 24 May 2018 06:19:02 -0400 Subject: [PATCH 3/5] add cmdlist_check file which store the commands need to be included in install file --- xCAT-genesis-builder/buildrpm | 14 ++++++++++++++ xCAT-genesis-builder/cmdlist_check | 1 + xCAT-test/autotest/testcase/install_xCAT/case0 | 8 -------- 3 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 xCAT-genesis-builder/cmdlist_check diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm index 0aed251d1..9defefb95 100755 --- a/xCAT-genesis-builder/buildrpm +++ b/xCAT-genesis-builder/buildrpm @@ -144,6 +144,20 @@ libnss_pkgname=`find /usr/lib64/ -name libnss_dns-2*.so | xargs basename` sed -i "s/\/lib64\/libnss_dns-2.12.so/\/usr\/lib64\/$libnss_pkgname/g" $DRACUTMODDIR/install sed -i 's/\/lib64\/libnss_dns.so.2/\/usr\/lib64\/libnss_dns.so.2/' $DRACUTMODDIR/install +# Based on cmdlist_check, makesure the commands are included in $DRACUTMODDIR/install +if [ -e "${DRACUTMODDIR}/cmdlist_check" ]; then + miss_cmd=0 + for cmd in `cat ${DRACUTMODDIR}/cmdlist_check`; do + if ! grep $cmd $DRACUTMODDIR/install; then + echo "The $cmd is missed in install file" + miss_cmd=1 + fi + done + if [ "$miss_cmd" = 1 ]; then + exit 1 + fi +fi + mkdir -p /tmp/xcatgenesis.$$/opt/xcat/share/xcat/netboot/genesis/$BUILDARCH/fs # run dracut diff --git a/xCAT-genesis-builder/cmdlist_check b/xCAT-genesis-builder/cmdlist_check new file mode 100644 index 000000000..ad9795861 --- /dev/null +++ b/xCAT-genesis-builder/cmdlist_check @@ -0,0 +1 @@ +ntp-wait diff --git a/xCAT-test/autotest/testcase/install_xCAT/case0 b/xCAT-test/autotest/testcase/install_xCAT/case0 index bab013f6b..05bc1f7c7 100644 --- a/xCAT-test/autotest/testcase/install_xCAT/case0 +++ b/xCAT-test/autotest/testcase/install_xCAT/case0 @@ -18,10 +18,6 @@ check:output=~Version cmd:service xcatd status check:rc==0 check:output=~running -cmd:rpm -ql xCAT-genesis-base-x86_64 |grep ntp-wait -check:rc==0 -cmd:rpm -ql xCAT-genesis-base-ppc64 |grep ntp-wait -check:rc==0 cmd:rm -rf /install_xCAT_xcat-core.tar.bz2 /install_xCAT_xcat-dep.tar.bz2 end @@ -47,10 +43,6 @@ check:output=~Version cmd:service xcatd status check:rc==0 check:output=~running -cmd:dpkg -L xcat-genesis-base-ppc64 |grep ntp-wait -check:rc==0 -cmd:dpkg -L xcat-genesis-base-amd64 |grep ntp-wait -check:rc==0 cmd:rm -rf /install_xCAT_xcat-core.tar.bz2 /install_xCAT_xcat-dep.tar.bz2 end From 360e3165ff9903b2c1b00e836ddc880397d4c969 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Thu, 24 May 2018 23:04:39 -0400 Subject: [PATCH 4/5] Modify the error message --- xCAT-genesis-builder/buildrpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xCAT-genesis-builder/buildrpm b/xCAT-genesis-builder/buildrpm index 9defefb95..28a544d5b 100755 --- a/xCAT-genesis-builder/buildrpm +++ b/xCAT-genesis-builder/buildrpm @@ -149,7 +149,7 @@ if [ -e "${DRACUTMODDIR}/cmdlist_check" ]; then miss_cmd=0 for cmd in `cat ${DRACUTMODDIR}/cmdlist_check`; do if ! grep $cmd $DRACUTMODDIR/install; then - echo "The $cmd is missed in install file" + echo "ERROR: The required $cmd is not included in the install file to build the Genesis base package" miss_cmd=1 fi done From 47b0eada4fa7cd4a9f47ade2c95f86c65fcdedf0 Mon Sep 17 00:00:00 2001 From: ertaozh Date: Thu, 31 May 2018 02:26:46 -0400 Subject: [PATCH 5/5] Add release information for 2.14.1 --- docs/source/conf.py | 2 +- docs/source/overview/xcat2_release.rst | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/docs/source/conf.py b/docs/source/conf.py index 312deac0d..b51055b4e 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -59,7 +59,7 @@ author = u'IBM Corporation' # The short X.Y version. version = '2' # The full version, including alpha/beta/rc tags. -release = '2.14' +release = '2.14.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/docs/source/overview/xcat2_release.rst b/docs/source/overview/xcat2_release.rst index 837edc12f..ee7b62dfd 100644 --- a/docs/source/overview/xcat2_release.rst +++ b/docs/source/overview/xcat2_release.rst @@ -14,6 +14,20 @@ xCAT 2.14.x |xCAT |New OS |New |New Feature | |Version | |Hardware | | +=================================+===============+=============+==================================+ +|| xCAT 2.14.1 |- RHV4.2 + | |- OpenBMC in python enhance: | +|| 2018/6/1 | RHEL7.5 + p8 | | | +|| | | | rinv enhance,issue #5176 | +| `2.14.1 Release Notes `_ | | | | +| | | |- Discover process enhance | +| | | | | +| | | |- xcatprobe `xcatmn` enhance | +| | | | | +| | | |- xcat-inventory enhance(beta) | +| | | | | +| | | |- goconserver v0.2.2 | ++---------------------------------+---------------+-------------+----------------------------------+ || xCAT 2.14 |- RHEL 7.5 | |- OpenBMC support in python: | || 2018/4/20 | | | | || | | | rspconfig,reventlog |