Merge amd-staging into amd-master 20230607

Signed-off-by: Hao Zhou <Hao.Zhou@amd.com>
Change-Id: I1d26d320c15cb3bd813019140a4492f7f9e08362

DEBIAN/postinst.in

@@ -38,7 +38,7 @@ do_configureLogrotate() {
     dateformat .%%Y-%%m-%%d_%H:%%M:%%S
 }
 EOF
-  # Fix for %S argument not found (now we escape with %%)
+  # Fix for % S argument not found (now we escape with %%)
   # issue was RPM build thought we were using macros
   # https://gitlab.kitware.com/cmake/cmake/-/issues/22965
   # https://rpm-software-management.github.io/rpm/manual/spec.html

RPM/post.in

@@ -37,7 +37,7 @@ do_configureLogrotate() {
     dateformat .%%Y-%%m-%%d_%H:%%M:%%S
 }
 EOF
-  # Fix for %S argument not found (now we escape with %%)
+  # Fix for % S argument not found (now we escape with %%)
   # issue was RPM build thought we were using macros
   # https://gitlab.kitware.com/cmake/cmake/-/issues/22965
   # https://rpm-software-management.github.io/rpm/manual/spec.html

tests/rocm_smi_test/rsmitst.exclude

@@ -12,14 +12,16 @@ PERMANENT_BLACKLIST_ALL_ASICS=
 
 # This is the temporary blacklist for all ASICs. This is to be used when a test
 # is failing consistently
-TEMPORARY_BLACKLIST_ALL_ASICS=
+TEMPORARY_BLACKLIST_ALL_ASICS=\
+"rsmitstReadOnly.TestVoltCurvRead"
 
-if [ -z $PERMANENT_BLACKLIST_ALL_ASICS -a -z $TEMPORARY_BLACKLIST_ALL_ASICS ]; then
+
+if [ -z "$PERMANENT_BLACKLIST_ALL_ASICS" -a -z "$TEMPORARY_BLACKLIST_ALL_ASICS" ]; then
   BLACKLIST_ALL_ASICS=
 else
   BLACKLIST_ALL_ASICS=\
-    "$PERMANENT_BLACKLIST_ALL_ASICS:"\
-    "$TEMPORARY_BLACKLIST_ALL_ASICS"
+"$PERMANENT_BLACKLIST_ALL_ASICS:"\
+"$TEMPORARY_BLACKLIST_ALL_ASICS"
 fi
 
 # Device specific blacklists
@@ -63,4 +65,4 @@ $BLACKLIST_ALL_ASICS\
 "rsmitstReadWrite.FanReadWrite:"\
 "rsmitstReadWrite.TestOverdriveReadWrite:"\
 "rsmitstReadWrite.TestPowerReadWrite:"\
-"rsmitstReadWrite.TestPowerCapReadWrite"
+"rsmitstReadWrite.TestPowerCapReadWrite"