Fix PR 4798 comments

- use "use" in sycomp-storage-slurm instead of defining "network_storage"
- Put the four blueprint examples related to sycomp into the exclude list of unittest

Author: gqiu-sycomp-com

community/examples/sycomp/sycomp-storage-ece.yaml

@@ -41,7 +41,7 @@ deployment_groups:
       allowed_ssh_ip_ranges: []
 
   - id: sycomp-scale-gcp
-    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale?ref=v1.0.0"
+    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale?ref=main"
     use: [network1]
     settings:
       security:

community/examples/sycomp/sycomp-storage-expansion.yaml

@@ -31,7 +31,7 @@ deployment_groups:
   modules:
 
   - id: sycomp-scale-expansion
-    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale-expansion?ref=v1.0.0"
+    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale-expansion?ref=main"
     settings:
       name_prefix: "<name_prefix_of_existing_cluster>" ## Set to the name_prefix of the cluster to expand. See the README for details on how this value is determined.
       add_scale_nodes: 1                               ## Number of storage nodes to add, This value is configurable.

community/examples/sycomp/sycomp-storage-slurm.yaml

@@ -42,7 +42,7 @@ deployment_groups:
       allowed_ssh_ip_ranges: []
 
   - id: sycomp-scale-gcp
-    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale?ref=v1.0.0"
+    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale?ref=main"
     use: [network1]
     settings:
       security:
@@ -69,7 +69,7 @@ deployment_groups:
       nfs_exports:
       - path: $(vars.nfs_dir)
         clients:
-        - no_root_squash: false               ## Enable root squashing (secure default). Set to true to disable.
+        - no_root_squash: true                ## Disable root squashing. Set to false to enable(secure default).
 
   ## Set up slurm cluster and configure NFS client
   - id: compute_nodeset
@@ -101,12 +101,6 @@ deployment_groups:
     - network1
     - compute_partition
     - slurm_login
+    - sycomp-scale-gcp
     settings:
       enable_controller_public_ips: true
-      network_storage:
-      ## Setup NFS client to mount sycomp storage NFS server
-      - server_ip: $(sycomp-scale-gcp.nfs_server.dns_name)
-        remote_mount: $(vars.nfs_dir)
-        mount_options: "vers=4,nconnect=16,rsize=1048576,wsize=1048576"
-        local_mount: "/nfs/sycomp"
-        fs_type: nfs

community/examples/sycomp/sycomp-storage.yaml

@@ -41,7 +41,7 @@ deployment_groups:
       allowed_ssh_ip_ranges: []
 
   - id: sycomp-scale-gcp
-    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale?ref=v1.0.0"
+    source: "git::https://gitlab.com/sycomp/cluster-toolkit.git//sycomp-scale?ref=main"
     use: [network1]
     settings:
       security:

tools/validate_configs/validate_configs.sh

@@ -124,6 +124,10 @@ CONFIGS=$(find examples/ community/examples/ tools/validate_configs/test_configs
 # Exclude blueprints that use v5 modules.
 declare -A EXCLUDE_EXAMPLE
 EXCLUDE_EXAMPLE["tools/validate_configs/test_configs/two-clusters-sql.yaml"]=
+EXCLUDE_EXAMPLE["community/examples/sycomp/sycomp-storage.yaml"]=
+EXCLUDE_EXAMPLE["community/examples/sycomp/sycomp-storage-ece.yaml"]=
+EXCLUDE_EXAMPLE["community/examples/sycomp/sycomp-storage-slurm.yaml"]=
+EXCLUDE_EXAMPLE["community/examples/sycomp/sycomp-storage-expansion.yaml"]=
 
 cwd=$(pwd)
 NPROCS=${NPROCS:-$(nproc)}