Merge branch 'develop' into kueue

Author: kadupoornima

.github/workflows/pr-precommit.yml

@@ -32,6 +32,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - name: Free Disk Space (Ubuntu)
+      uses: jlumbroso/free-disk-space@main
+      with:
+        tool-cache: false
+        android: true
+        dotnet: true
+        haskell: true
+        large-packages: true
     - uses: actions/setup-python@v5
       with:
         # internal Python tests require Python 3.12
@@ -61,6 +69,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+    - name: Free Disk Space (Ubuntu)
+      uses: jlumbroso/free-disk-space@main
+      with:
+        tool-cache: false
+        android: true
+        dotnet: true
+        haskell: true
+        large-packages: true
     - uses: actions/setup-python@v5
       with:
         # the slurm-files Python requirements.txt requires updating

Makefile

@@ -8,7 +8,7 @@ MIN_GOLANG_VERSION=1.24 # for building gcluster
         warn-go-version warn-terraform-version warn-packer-version \
         test-engine validate_configs validate_golden_copy packer-check \
         terraform-format packer-format mypy \
-        check-tflint check-pre-commit
+        check-tflint check-pre-commit ci-tests
 
 SHELL=/bin/bash -o pipefail
 ENG = ./cmd/... ./pkg/...
@@ -71,6 +71,7 @@ install-dev-deps: warn-terraform-version warn-packer-version check-pre-commit ch
 	go install mvdan.cc/sh/v3/cmd/shfmt@latest
 	go install golang.org/x/tools/cmd/goimports@latest
 	go install honnef.co/go/tools/cmd/staticcheck@latest
+	go install github.com/jstemmer/go-junit-report/v2@latest
 	pip install -r community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/requirements.txt
 	pip install -r community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/requirements-dev.txt
 	pip install mypy==1.18.2
@@ -93,6 +94,9 @@ clean:
 	done
 
 # RULES SUPPORTING THE ABOVE
+ci-tests: warn-go-missing
+	$(info **************** running gcluster unit tests for CI **************)
+	go test -v $(ENG) | go-junit-report > test-results.xml
 
 test-engine: warn-go-missing
 	$(info **************** vetting go code **********************)

README.md

@@ -119,7 +119,7 @@ The Cluster Toolkit officially supports the following VM images:
 
 * HPC Rocky Linux 8
 * Debian 11
-* Ubuntu 20.04 LTS
+* Ubuntu 22.04 LTS
 
 For more information on these and other images, see
 [docs/vm-images.md](docs/vm-images.md).

community/examples/hpc-slinky/hpc-slinky.yaml

@@ -49,7 +49,7 @@ deployment_groups:
           ip_cidr_range: 10.0.32.0/20
 
   - id: node_pool_service_account
-    source: community/modules/project/service-account
+    source: modules/project/service-account
     settings:
       name: gke-np-sa
       project_roles:
@@ -61,7 +61,7 @@ deployment_groups:
       - artifactregistry.reader
 
   - id: workload_service_account
-    source: community/modules/project/service-account
+    source: modules/project/service-account
     settings:
       name: gke-wl-sa
       project_roles:

…unity/examples/hpc-slurm-ubuntu2004.yaml …unity/examples/hpc-slurm-ubuntu2204.yamlcommunity/examples/hpc-slurm-ubuntu2004.yaml renamed to community/examples/hpc-slurm-ubuntu2204.yaml community/examples/hpc-slurm-ubuntu2004.yaml renamed to community/examples/hpc-slurm-ubuntu2204.yaml

@@ -14,7 +14,7 @@
 
 ---
 
-blueprint_name: hpc-slurm-ubuntu2004-v6
+blueprint_name: hpc-slurm-ubuntu2204-v6
 
 vars:
   project_id:  ## Set GCP Project ID Here ##

community/examples/slurm-gke/slurm-gke.yaml

@@ -76,7 +76,7 @@ deployment_groups:
 ###### GKE Setup ######
 
   - id: gke_service_account
-    source: community/modules/project/service-account
+    source: modules/project/service-account
     settings:
       name: slinky-gke-sa
       project_roles:

community/front-end/ofe/website/ghpcfe/templates/blueprint/cluster_config.yaml.j2

@@ -51,7 +51,7 @@ deployment_groups:
 
 {{ filesystems_yaml | safe }}
 
-  - source: community/modules/project/service-account
+  - source: modules/project/service-account
     kind: terraform
     id: hpc_service_account
     settings:

community/modules/container/artifact-registry/README.md

@@ -23,7 +23,7 @@ You will need to enable the relevant APIs and create a Service Account for your
         - cloudbuild.googleapis.com
         - artifactregistry.googleapis.com
 
-  - source: community/modules/project/service-account
+  - source: modules/project/service-account
     kind: terraform
     id: hpc_service_account
     settings:

community/modules/scheduler/htcondor-service-accounts/README.md

@@ -100,9 +100,9 @@ No providers.
 
 | Name | Source | Version |
 |------|--------|---------|
-| <a name="module_access_point_service_account"></a> [access\_point\_service\_account](#module\_access\_point\_service\_account) | ../../../../community/modules/project/service-account | n/a |
-| <a name="module_central_manager_service_account"></a> [central\_manager\_service\_account](#module\_central\_manager\_service\_account) | ../../../../community/modules/project/service-account | n/a |
-| <a name="module_execute_point_service_account"></a> [execute\_point\_service\_account](#module\_execute\_point\_service\_account) | ../../../../community/modules/project/service-account | n/a |
+| <a name="module_access_point_service_account"></a> [access\_point\_service\_account](#module\_access\_point\_service\_account) | ../../../../modules/project/service-account | n/a |
+| <a name="module_central_manager_service_account"></a> [central\_manager\_service\_account](#module\_central\_manager\_service\_account) | ../../../../modules/project/service-account | n/a |
+| <a name="module_execute_point_service_account"></a> [execute\_point\_service\_account](#module\_execute\_point\_service\_account) | ../../../../modules/project/service-account | n/a |
 
 ## Resources
 

community/modules/scheduler/htcondor-service-accounts/main.tf

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-# NB: the community/modules/project/service-account module will not output the
+# NB: the modules/project/service-account module will not output the
 # service account e-mail address until all IAM bindings have been created; if
 # underlying implementation changes, this module should declare explicit
 # depends_on the IAM bindings to prevent race conditions for services that
 # require them
 
 module "access_point_service_account" {
-  source = "../../../../community/modules/project/service-account"
+  source = "../../../../modules/project/service-account"
 
   project_id      = var.project_id
   display_name    = "HTCondor Access Point"
@@ -31,7 +31,7 @@ module "access_point_service_account" {
 }
 
 module "execute_point_service_account" {
-  source = "../../../../community/modules/project/service-account"
+  source = "../../../../modules/project/service-account"
 
   project_id      = var.project_id
   display_name    = "HTCondor Execute Point"
@@ -41,7 +41,7 @@ module "execute_point_service_account" {
 }
 
 module "central_manager_service_account" {
-  source = "../../../../community/modules/project/service-account"
+  source = "../../../../modules/project/service-account"
 
   project_id      = var.project_id
   display_name    = "HTCondor Central Manager"