Merge pull request #806 from CamStan/main

Merge dev into main for release 2.0

Author: adammoody

.gitlab-ci.yml

@@ -107,7 +107,7 @@ stages:
   script:
     - cd unifyfs-build/t && $JOB_LAUNCH_COMMAND make check
   after_script:
-    - rm -rf /tmp/unify* /tmp/tmp.* /tmp/mdhim* /tmp/na_sm | true
+    - rm -rf /tmp/unify* /tmp/tmp.* /tmp/na_sm | true
 
 # Run the integration test suite with the options provided from the specific
 # job.
@@ -156,7 +156,9 @@ before_script:
 # Running with lsf tag here, but this may be too vague as the job may attempt to
 # use a runner on a system the service user doesn't have permission to access.
 # If so, move this job to a specific system.
-full_clean:
+# TODO: this fails when the rm tries to run on the path this job is running
+# from. Rewrite to exclude current runner.
+.full_clean:
   stage: clean
   extends: .base-template
   variables:
@@ -166,12 +168,11 @@ full_clean:
   tags:
     - shell
   before_script: []
-  script: rm -rf ${HOME}/.jacamar-ci/*
+  script: rm -rf ${WORKSPACE}/.jacamar-ci/*
   needs: []
 
 # System specific jobs
 include:
   - local: .gitlab/ascent.yml
-  - local: .gitlab/catalyst.yml
   - local: .gitlab/lassen.yml
   - local: .gitlab/quartz.yml

.gitlab/catalyst.yml

@@ -173,3 +173,76 @@ lassen-gcc-8_3_1-integ-test-scheduled-stage:
     CI_TEST_OPTIONS: ":: -s stage"
   extends: [.lsf-multi-node-template, .lassen-scheduled-batch-template, .lassen-gcc-8_3_1-template, .integ-test-template]
   needs: ["lassen-gcc-8_3_1-scheduled-build"]
+
+
+### [email protected] ###
+.lassen-gcc-11_2_1-template:
+  variables:
+    COMPILER: gcc/11.2.1
+    CC_COMMAND: "which gcc"
+    FC_COMMAND: "which gfortran"
+    SPACK_ENV_NAME: "unifyfs-lsf-gcc11_2_1"
+
+lassen-gcc-11_2_1-install-deps:
+  extends: [.lassen-shell-template, .lassen-gcc-11_2_1-template, .install-deps-template]
+
+lassen-gcc-11_2_1-build:
+  extends: [.lassen-shell-template, .lassen-gcc-11_2_1-template, .build-template]
+  needs: ["lassen-gcc-11_2_1-install-deps"]
+
+lassen-gcc-11_2_1-unit-test:
+  extends: [.lsf-single-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .unit-test-template]
+  needs: ["lassen-gcc-11_2_1-build"]
+
+# Integration tests
+
+lassen-gcc-11_2_1-integ-test-writeread-posix:
+  variables:
+    CI_TEST_OPTIONS: ":: -s writeread -t posix"
+  extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
+  needs: ["lassen-gcc-11_2_1-build"]
+
+lassen-gcc-11_2_1-integ-test-writeread-mpiio:
+  variables:
+    CI_TEST_OPTIONS: ":: -s writeread -t mpiio"
+  extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
+  needs: ["lassen-gcc-11_2_1-build"]
+
+lassen-gcc-11_2_1-integ-test-read-posix:
+  variables:
+    CI_TEST_OPTIONS: ":: -s read -t posix"
+  extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
+  needs: ["lassen-gcc-11_2_1-build"]
+
+lassen-gcc-11_2_1-integ-test-read-mpiio:
+  variables:
+    CI_TEST_OPTIONS: ":: -s read -t mpiio"
+  extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
+  needs: ["lassen-gcc-11_2_1-build"]
+
+lassen-gcc-11_2_1-integ-test-pc-all:
+  variables:
+    CI_TEST_OPTIONS: ":: -s pc -t all"
+  extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
+  needs: ["lassen-gcc-11_2_1-build"]
+
+lassen-gcc-11_2_1-integ-test-stage:
+  variables:
+    CI_TEST_OPTIONS: ":: -s stage"
+  extends: [.lsf-multi-node-template, .lassen-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
+  needs: ["lassen-gcc-11_2_1-build"]
+
+# Larger Scheduled Stage Job(s)
+
+lassen-gcc-11_2_1-scheduled-install-deps:
+  extends: [.lassen-scheduled-shell-template, .lassen-gcc-11_2_1-template, .install-deps-template]
+
+lassen-gcc-11_2_1-scheduled-build:
+  extends: [.lassen-scheduled-shell-template, .lassen-gcc-11_2_1-template, .build-template]
+  needs: ["lassen-gcc-11_2_1-scheduled-install-deps"]
+
+lassen-gcc-11_2_1-integ-test-scheduled-stage:
+  variables:
+    CI_TEST_OPTIONS: ":: -s stage"
+  extends: [.lsf-multi-node-template, .lassen-scheduled-batch-template, .lassen-gcc-11_2_1-template, .integ-test-template]
+  needs: ["lassen-gcc-11_2_1-scheduled-build"]