diff --git a/xCAT-test/autotest/linux.conf.template b/xCAT-test/autotest/linux.conf.template index 2e7c9e52f..6dbfa6553 100644 --- a/xCAT-test/autotest/linux.conf.template +++ b/xCAT-test/autotest/linux.conf.template @@ -78,7 +78,7 @@ MIGRATION1_DEP=http://xcat.org/files/xcat/xcat-dep/2.x_Linux/xcat-dep-2.10.tar.b MIGRATION2_DEP=http://xcat.org/files/xcat/xcat-dep/2.x_Linux/xcat-dep-2.11.1.tar.bz2 MIGRATION1_VERSION=2.10 MIGRATION2_VERSION=2.11.1 -LATEST_VERSION=2.12 +LATEST_VERSION=2.12.1 #For migration cass End [Custom] diff --git a/xCAT-test/autotest/testcase/migration/redhat_migration b/xCAT-test/autotest/testcase/migration/redhat_migration index a40c4f13a..975456215 100644 --- a/xCAT-test/autotest/testcase/migration/redhat_migration +++ b/xCAT-test/autotest/testcase/migration/redhat_migration @@ -63,7 +63,7 @@ cmd:xdsh $$CN "tar -jxvf /oldxcat/xcat-core* -C /oldxcat" check:rc==0 cmd:xdsh $$CN "/oldxcat/xcat-core/mklocalrepo.sh" check:rc==0 -cmd:xdsh $$CN "cd /oldxcat/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" +cmd:xdsh $$CN "cd /oldxcat/xcat-dep/rh`echo __GETNODEATTR($$CN,os)__ | cut -c6`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "yum clean all;yum -y install xCAT" check:rc==0 @@ -90,7 +90,7 @@ cmd:xdsh $$CN "cd /root/xcat-core;./mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2" check:rc==0 -cmd:xdsh $$CN "cd /root/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" +cmd:xdsh $$CN "cd /root/xcat-dep/rh`echo __GETNODEATTR($$CN,os)__ | cut -c6`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "yum clean metadata;yum -y update '*xCAT*'" check:rc==0 @@ -171,7 +171,7 @@ cmd:xdsh $$CN "tar -jxvf /oldxcat/xcat-core* -C /oldxcat" check:rc==0 cmd:xdsh $$CN "/oldxcat/xcat-core/mklocalrepo.sh" check:rc==0 -cmd:xdsh $$CN "cd /oldxcat/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" +cmd:xdsh $$CN "cd /oldxcat/xcat-dep/rh`echo __GETNODEATTR($$CN,os)__ | cut -c6`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "yum clean all;yum -y install xCAT" check:rc==0 @@ -198,7 +198,7 @@ cmd:xdsh $$CN "cd /root/xcat-core;./mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "tar -jxvf /xcat-dep*.tar.bz2" check:rc==0 -cmd:xdsh $$CN "cd /root/xcat-dep/rh`more /etc/*release|grep VERSION_ID|cut -c13`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" +cmd:xdsh $$CN "cd /root/xcat-dep/rh`echo __GETNODEATTR($$CN,os)__ | cut -c6`/__GETNODEATTR($$CN,arch)__/;./mklocalrepo.sh" check:rc==0 cmd:xdsh $$CN "yum clean metadata;yum -y update '*xCAT*'" check:rc==0