v2.0

oracle-devrel · Mar 8, 2024 · 0016737 · 0016737
1 parent 1506ae6
commit 0016737
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/basis/bin/auto_env.sh b/basis/bin/auto_env.sh
@@ -2,11 +2,13 @@
 
 # Check the SHAPE
 unset MISMATCH_PLATFORM
-if [ "$TF_VAR_shape" == "ampere" ] && [ `arch` != "aarch64" ]; then
-  if [ "$TF_VAR_deploy_type" == "kubernetes" ] || [ "$TF_VAR_deploy_type" == "container_instance" ] || [ "$TF_VAR_deploy_type" == "function" ]; then
-    MISMATCH_PLATFORM="ERROR: ARM (Ampere) build using Containers (Kubernetes / Cointainer Instance / Function) needs to run on ARM processor"
-    DESIRED_PLATFORM="ARM (aarch64)"
-  fi   
+if [ "$TF_VAR_instance_shape" == "VM.Standard.A1.Flex" ]; then
+  if [ `arch` != "aarch64" ]; then
+    if [ "$TF_VAR_deploy_type" == "kubernetes" ] || [ "$TF_VAR_deploy_type" == "container_instance" ] || [ "$TF_VAR_deploy_type" == "function" ]; then
+        MISMATCH_PLATFORM="ERROR: ARM (Ampere) build using Containers (Kubernetes / Cointainer Instance / Function) needs to run on ARM processor"
+        DESIRED_PLATFORM="ARM (aarch64)"
+    fi   
+  fi
 elif [ `arch` != "x86_64" ]; then
   if [ "$TF_VAR_deploy_type" == "kubernetes" ] || [ "$TF_VAR_deploy_type" == "container_instance" ] || [ "$TF_VAR_deploy_type" == "function" ]; then
     MISMATCH_PLATFORM="ERROR: X86_64 (AMD/Intel) build using Containers (Kubernetes / Cointainer Instance / Function) needs to run on X86 (AMD/Intel) processor"

diff --git a/test_suite/test_suite.sh b/test_suite/test_suite.sh
@@ -36,12 +36,13 @@ loop_ui() {
 }
 
 loop_shape() {
-  OPTION_SHAPE=amd 
-  loop_ui
-  if [ "$OPTION_DEPLOY" == "compute" ] && [ "$OPTION_DB" == "none" ] && [ "$OPTION_JAVA_VM" != "graalvm-native" ]; then
+  if [ `arch` == "aarch64" ]; then
     OPTION_SHAPE=ampere
     loop_ui
-  fi
+  else   
+    OPTION_SHAPE=amd 
+    loop_ui
+  fi  
 }
 
 loop_db() {