diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.environment b/xCAT-test/autotest/testcase/xcat-inventory/cases.environment
index f0c269173..9ed29558c 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.environment
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.environment
@@ -21,7 +21,7 @@ check:rc==0
 
 cmd:rootimgdir=`lsdef -t osimage __GETNODEATTR($$CN,os)__-__GETNODEATTR($$CN,arch)__-netboot-compute|grep rootimgdir|awk -F'=' '{print $2}'`; if [ -d $rootimgdir ]; then mv $rootimgdir $rootimgdir.regbak -f;fi
 check:rc==0
-cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
+cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
 check:output=~Importing object: test.environments.osimage
 check:output=~Inventory import successfully!
 check:rc==0
@@ -31,7 +31,6 @@ cmd:genimage test.environments.osimage
 check:rc==0
 cmd:packimage test.environments.osimage 
 check:rc==0
-
 cmd:rinstall $$CN osimage=test.environments.osimage
 check:rc==0
 check:output=~Provision node\(s\)\: $$CN
@@ -86,7 +85,7 @@ label:others,xcat_inventory
 cmd:lsdef -t osimage -o test.environments.osimage >/dev/null 2>&1;if [[ $? -eq 0 ]]; then lsdef -t osimage -o test.environments.osimage -z >/tmp/test.environments.osimage_image.stanza ;rmdef -t osimage -o test.environments.osimage;fi
 check:rc==0
 cmd:dir="/tmp/export";if [ -e "${dir}" ];then mv ${dir} ${dir}".bak"; fi; mkdir -p $dir
-cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml
+cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.yaml -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
 check:output=~Importing object: test.environments.osimage
 check:output=~Inventory import successfully!
 check:rc==0
@@ -101,7 +100,7 @@ cmd:diff -y  /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templat
 check:rc==0
 cmd:rmdef -t osimage -o test.environments.osimage
 check:rc==0
-cmd:export GITREPO="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo";export SWDIR="/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir";xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json
+cmd:xcat-inventory import -f /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json -e GITREPO=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/gitrepo -e SWDIR=/opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/environment/swdir
 check:output=~Importing object: test.environments.osimage
 check:output=~Inventory import successfully!
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall
index 979d03cf4..4ae2fa51c 100755
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/gitrepo/postinstall/test1.postinstall
@@ -48,5 +48,5 @@ fi
 #  [ -r $workdir/$profile.$ext ] && cat $workdir/$profile.$ext | grep -E '^[[:space:]]*#.*[[:space:]]\$Id' >> $installroot/etc/IMGVERSION
 #done
 echo "test postisntall" >> $installroot/tmp/test1.postinstall
-${GITREPO}/postinstall/test2.postinstall
+${GITREPO}/postinstall/test2.postinstall $installroot
 
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
index 89a511b21..a7e38bdcb 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.yaml
@@ -2,8 +2,8 @@ osimage:
   test.environments.osimage:
     basic_attributes:
       arch: ppc64le
-      distribution: rhels7.5-alternate 
-      osdistro: rhels7.5-alternate-ppc64le 
+      distribution: rhels7.5 
+      osdistro: rhels7.5-ppc64le 
       osname: Linux
     filestosync: {{GITREPO}}/syncfiles/synclist
     deprecated:
@@ -16,7 +16,7 @@ osimage:
     package_selection:
       otherpkgdir: {{SWDIR}}/otherpkgdir/
       otherpkglist: {{GITREPO}}/otherpkglist/test1.otherpkglist,{{GITREPO}}/otherpkglist/test2.otherpkglist,
-      pkgdir: /install/rhels7.5-alternate/ppc64le,{{SWDIR}}/pkgdir/
+      pkgdir: /install/rhels7.5/ppc64le,{{SWDIR}}/pkgdir/
       pkglist: /opt/xcat/share/xcat/netboot/rh/compute.rhels7.ppc64le.pkglist,{{GITREPO}}/pkglist/test1.pkglist,{{GITREPO}}/pkglist/test2.pkglist
     provision_mode: netboot
     role: compute