Merge pull request #1686 from GoogleCloudPlatform/release-candidate

Release v1.22.0

.github/dependabot.yml

@@ -18,6 +18,10 @@ version: 2
 updates:
 - package-ecosystem: gomod
   directory: /
+  labels:
+  - dependencies
+  - go
+  - chore
   schedule:
     interval: weekly
     day: monday
@@ -26,6 +30,10 @@ updates:
   target-branch: develop
 - package-ecosystem: pip
   directory: /community/front-end/ofe/
+  labels:
+  - dependencies
+  - python
+  - release-chore
   schedule:
     interval: monthly
     time: "03:00"

.github/release.yml

@@ -0,0 +1,44 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# For more info, see:
+# https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuration-options
+
+changelog:
+  exclude:
+    labels:
+    - release-chore
+    authors: []
+  categories:
+  - title: Key New Features 🎉
+    labels:
+    - release-key-new-features
+  - title: New Modules 🧱
+    labels:
+    - release-new-modules
+  - title: Module Improvements 🛠
+    labels:
+    - release-module-improvements
+  - title: Improvements
+    labels:
+    - release-improvements
+  - title: Deprecations
+    labels:
+    - release-deprecations
+  - title: Version Updates
+    labels:
+    - release-version-updates
+  - title: Other changes
+    labels:
+    - "*"

.github/workflows/pr-label-validation.yml

@@ -0,0 +1,52 @@
+# Copyright 2022 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Dependency Review Action
+#
+# This Action will ensure that a label exists on a PR.
+name: 'Ensure PR label exists'
+
+on:
+  pull_request:
+    types:
+    - opened
+    - labeled
+    - unlabeled
+    - synchronize
+    - edited
+    - ready_for_review
+    - unlocked
+    branches:
+    - develop
+
+jobs:
+  pr-label-validation:
+    runs-on: ubuntu-latest
+    permissions:
+      pull-requests: read
+    steps:
+    - id: check-labels
+      uses: mheap/github-action-required-labels@v5
+      with:
+        mode: minimum
+        count: 1
+        labels: "release-chore, release-key-new-features, release-new-modules, release-module-improvements, release-improvements, release-deprecations, release-version-updates"
+        message: "This PR is being prevented from merging because it is not labeled.  Please add a label to this PR.  Accepted labels: release-chore, release-key-new-features, release-new-modules, release-module-improvements, release-improvements, release-deprecations, release-version-updates"
+    - id: print-labels
+      run: |
+        echo "Current PR labels:"
+        for f in $(echo "{{steps.check-labels.outputs.labels}}" | sed "s/,/ /g")
+        do
+          echo "$f"
+        done

.pre-commit-config.yaml

@@ -46,7 +46,7 @@ repos:
     entry: python3 tools/duplicate-diff.py
     language: python
     language_version: python3
-    files: '.*(\.sh|\.tf)$'
+    files: '.*(\.sh|\.tf|\.tftpl)$'
     pass_filenames: true
     require_serial: true
   - id: module-label-check

cmd/root.go

@@ -50,7 +50,7 @@ HPC deployments on the Google Cloud Platform.`,
 				log.Fatalf("cmd.Help function failed: %s", err)
 			}
 		},
-		Version:     "v1.21.0",
+		Version:     "v1.22.0",
 		Annotations: annotation,
 	}
 )

community/examples/AMD/hpc-amd-slurm.yaml

@@ -39,21 +39,19 @@ deployment_groups:
     settings:
       local_mount: /sw
 
-  - id: spack
-    source: community/modules/scripts/spack-install
+  - id: spack-setup
+    source: community/modules/scripts/spack-setup
     settings:
       install_dir: /sw/spack
       spack_ref: v0.18.1
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       log_file: /var/log/spack.log
-      configs:
-      - type: file
-        scope: defaults
-        content: |
-          config:
-            build_stage:
-              - /opt/spack_build_stage
-      - type: file
-        scope: defaults
+      data_files:
+      - destination: /tmp/projections-config.yaml
         content: |
           modules:
             default:
@@ -64,28 +62,15 @@ deployment_groups:
                     - '{name}'
                 projections:
                   all: '{name}/{version}-{compiler.name}-{compiler.version}'
-      - type: file
-        scope: site
+      - destination: /tmp/slurm-external-config.yaml
         content: |
           packages:
             slurm:
               externals:
                 - spec: slurm@22-05-8
                   prefix: /usr/local
               buildable: False
-      - type: file
-        scope: site
-        content: |
-          concretizer:
-            targets:
-              host_compatible: false
-      compilers:
-      # gcc 12.1.0 is known to have runtime failures with OpenFOAM 8
-      # gcc 10.3.0 is the earliest copy of gcc with Zen 3 support
-      - gcc@10.3.0 %gcc@4.8.5 target=x86_64
-      environments:
-      - name: openfoam
-        type: file
+      - destination: /sw/spack/openfoam_env.yaml
         content: |
           spack:
             definitions:
@@ -110,13 +95,30 @@ deployment_groups:
               - - $^mpis
             concretizer:
               unify: when_possible
+      commands: |
+        spack config --scope defaults add config:build_stage:/opt/spack_build_stage
+        spack config --scope defaults add -f /tmp/projections-config.yaml
+        spack config --scope site add -f /tmp/slurm-external-config.yaml
+        spack config --scope site add concretizer:targets:host_compatible:false
+
+        # gcc 12.1.0 is known to have runtime failures with OpenFOAM 8
+        # gcc 10.3.0 is the earliest copy of gcc with Zen 3 support
+        spack install gcc@10.3.0 %gcc@4.8.5 target=x86_64
+        spack load gcc@10.3.0 %gcc@4.8.5 target=x86_64
+        spack compiler find --scope site
+
+        if ! spack env list | grep -q openfoam; then
+          spack env create openfoam /sw/spack/openfoam_env.yaml
+          spack env activate openfoam
+          spack concretize
+          spack install
+        fi
 
   - id: spack-startup
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: shell
         destination: shutdown.sh
         content: |
@@ -130,7 +132,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.setup_spack_runner)
+      - $(spack-setup.spack_runner)
       # the following installation of AOCC may be automated in the future
       # with a clear direction to the user to read the EULA at
       # https://developer.amd.com/aocc-compiler-eula/

community/examples/hpc-slurm-gromacs.yaml

@@ -45,17 +45,18 @@ deployment_groups:
       local_mount: /home
 
   ## Install Scripts
-  - id: spack
-    source: community/modules/scripts/spack-install
+  - id: spack-setup
+    source: community/modules/scripts/spack-setup
     settings:
       install_dir: /sw/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-setup]
+    settings:
       log_file: /var/log/spack.log
-      configs:
-      - type: single-config
-        scope: defaults
-        content: "config:build_stage:/sw/spack/spack-stage"
-      - type: file
-        scope: defaults
+      data_files:
+      - destination: /tmp/projections-config.yaml
         content: |
           modules:
             default:
@@ -66,23 +67,20 @@ deployment_groups:
                     - '{name}'
                 projections:
                   all: '{name}/{version}-{compiler.name}-{compiler.version}'
-      compilers:
-      - gcc@10.3.0 target=x86_64
-      packages:
-      - intel-mpi@2018.4.274%gcc@10.3.0
-      - gromacs@2023.1 %gcc@10.3.0 ^intel-mpi@2018.4.274 ^cmake@3.26.3 %gcc@4.8.5
-      # Uncomment and update the name and path to add a shared or personal Spack
-      # cache location to speed up future deployments.
-      # spack_cache_url:
-      # - mirror_name: gcs_cache
-      #   mirror_url: gs://bucket-name/...
+      commands: |
+        # Un-comment and update mirror_url to install from spack cache
+        # spack mirror add --scope site gcs_cache gs://optionally_set_spack_cache_bucket
+        # spack buildcache keys --install --trust
 
-  - id: spack-startup
-    source: modules/scripts/startup-script
-    settings:
-      runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+        spack config --scope defaults add config:build_stage:/sw/spack/spack-stage
+        spack config --scope defaults add -f /tmp/projections-config.yaml
+
+        spack install gcc@10.3.0 target=x86_64
+        spack load gcc@10.3.0 target=x86_64
+        spack compiler find --scope site
+
+        spack install intel-mpi@2018.4.274%gcc@10.3.0
+        spack install gromacs@2023.1 %gcc@10.3.0 ^intel-mpi@2018.4.274 ^cmake@3.26.3 %gcc@4.8.5
 
   - id: compute_partition
     source: community/modules/compute/SchedMD-slurm-on-gcp-partition
@@ -111,7 +109,7 @@ deployment_groups:
     - homefs
     - appsfs
     - slurm_controller
-    - spack-startup
+    - spack-execute
     settings:
       login_machine_type: c2-standard-4
       login_scopes:

community/examples/hpc-slurm-ramble-gromacs.yaml

@@ -35,23 +35,23 @@ deployment_groups:
     source: modules/network/vpc
 
   ## Install Scripts
-  - id: spack
-    source: community/modules/scripts/spack-install
+  - id: spack-install
+    source: community/modules/scripts/spack-setup
     settings:
       install_dir: /opt/apps/spack
+
+  - id: spack-execute
+    source: community/modules/scripts/spack-execute
+    use: [spack-install]
+    settings:
       log_file: /var/log/spack.log
-      configs:
-      - type: single-config
-        scope: defaults
-        content: "config:build_stage:/opt/apps/spack/spack-stage"
-      - type: single-config
-        scope: defaults
-        content: "concretizer:targets:host_compatible:false"
-      # Uncomment and update the name and path to add a shared or personal Spack
-      # cache location to speed up future deployments.
-      # spack_cache_url:
-      # - mirror_name: gcs_cache
-      #   mirror_url: gs://bucket-name/...
+      commands: |
+        # Un-comment and update mirror_url to install from spack cache
+        # spack mirror add --scope site gcs_cache gs://optionally_set_spack_cache_bucket
+        # spack buildcache keys --install --trust
+
+        spack config --scope defaults add config:build_stage:/opt/apps/spack/spack-stage
+        spack config --scope defaults add concretizer:targets:host_compatible:false
 
   - id: ramble-setup
     source: community/modules/scripts/ramble-setup
@@ -60,7 +60,7 @@ deployment_groups:
 
   - id: ramble-execute
     source: community/modules/scripts/ramble-execute
-    use: [spack, ramble-setup]
+    use: [spack-install, ramble-setup]
     settings:
       commands: |
         ramble workspace create gromacs -c /opt/apps/gromacs_scaling.yaml -t /opt/apps/execute_experiment.tpl
@@ -71,8 +71,7 @@ deployment_groups:
     source: modules/scripts/startup-script
     settings:
       runners:
-      - $(spack.install_spack_deps_runner)
-      - $(spack.install_spack_runner)
+      - $(spack-execute.spack_runner)
       - type: data
         destination: /opt/apps/gromacs_scaling.yaml
         content: |