From 5fea18f75c8a5831e342659c607d02f7cf1d1eed Mon Sep 17 00:00:00 2001
From: Stephanie Brink <brink2@llnl.gov>
Date: Thu, 24 Oct 2024 16:02:24 -0700
Subject: [PATCH] add all tests

---
 .gitlab/ci/test.yml | 128 +++++++++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 62 deletions(-)

diff --git a/.gitlab/ci/test.yml b/.gitlab/ci/test.yml
index 1e14fbf5..16a54ce9 100644
--- a/.gitlab/ci/test.yml
+++ b/.gitlab/ci/test.yml
@@ -65,6 +65,7 @@ status_failure:
     - *status_report
   when: on_failure
 
+# legacy run on tioga, dane, ruby, saxpy openmp
 legacy_test_run:
   stage: test
   tags:
@@ -100,38 +101,40 @@ legacy_test_run:
           - kripke
           - saxpy
 
-#test_run_tioga:
-#  stage: test
-#  tags:
-#    - tioga
-#    - shell
-#  rules:
-#    - changes:
-#        - .gitlab-ci.yml
-#        - .gitlab/ci/*
-#        - experiments/**
-#        - systems/**
-#        - repo/**
-#        - modifiers/**
-#        - var/**
-#        - lib/**
-#  script:
-#    - . /usr/workspace/benchpark-dev/benchpark-venv/$SYS_TYPE/bin/activate
-#    # Initialize system & experiment
-#    - ./bin/benchpark system init --dest=tioga-system tioga ~gtl
-#    - ./bin/benchpark experiment init --dest=${BENCHMARK}-benchmark ${BENCHMARK} programming_model=cuda
-#    # Build Workspace
-#    - ./bin/benchpark setup ${BENCHMARK}-benchmark tioga-system workspace/
-#    # Setup Ramble & Spack
-#    - . workspace/setup.sh
-#    # Setup Workspace
-#    - cd ./workspace/${BENCHMARK}-benchmark/Tioga-975af3c/workspace/
-#    - ramble --workspace-dir . --disable-progress-bar --disable-logger workspace setup
-#    # Run Experiments
-#    - ramble --workspace-dir . --disable-progress-bar --disable-logger on
-#  <<: *test_benchmarks
+# new run on tioga kripke/saxpy rocm
+test_run_tioga_rocm:
+  stage: test
+  tags:
+    - tioga
+    - shell
+  rules:
+    - changes:
+        - .gitlab-ci.yml
+        - .gitlab/ci/*
+        - experiments/**
+        - systems/**
+        - repo/**
+        - modifiers/**
+        - var/**
+        - lib/**
+  script:
+    - . /usr/workspace/benchpark-dev/benchpark-venv/$SYS_TYPE/bin/activate
+    # Initialize system & experiment
+    - ./bin/benchpark system init --dest=tioga-system tioga ~gtl
+    - ./bin/benchpark experiment init --dest=${BENCHMARK}-benchmark ${BENCHMARK} programming_model=rocm
+    # Build Workspace
+    - ./bin/benchpark setup ${BENCHMARK}-benchmark tioga-system workspace/
+    # Setup Ramble & Spack
+    - . workspace/setup.sh
+    # Setup Workspace
+    - cd ./workspace/${BENCHMARK}-benchmark/Tioga-975af3c/workspace/
+    - ramble --workspace-dir . --disable-progress-bar --disable-logger workspace setup
+    # Run Experiments
+    - ramble --workspace-dir . --disable-progress-bar --disable-logger on
+  <<: *test_benchmarks
 
-test_run_kripke:
+# new run on tioga, dane, ruby kripke openmp
+test_run_kripke_openmp:
   stage: test
   tags:
     - $HOST
@@ -150,7 +153,7 @@ test_run_kripke:
   script:
     - . /usr/workspace/benchpark-dev/benchpark-venv/$SYS_TYPE/bin/activate
     # Initialize system & experiment
-    - if $HOST == "tioga"; then ./bin/benchpark system init --dest=tioga-system tioga ~gtl; else ./bin/benchpark system init --dest=$HOST-system cts cluster=$HOST; fi
+    - if [ "$HOST" == "tioga" ]; then ./bin/benchpark system init --dest=tioga-system tioga ~gtl; else ./bin/benchpark system init --dest=$HOST-system cts cluster=$HOST; fi
     - ./bin/benchpark experiment init --dest=kripke-benchmark kripke programming_model=openmp
     # Build Workspace
     - ./bin/benchpark setup kripke-benchmark $HOST-system workspace/
@@ -162,33 +165,34 @@ test_run_kripke:
     # Run Experiments
     - ramble --workspace-dir . --disable-progress-bar --disable-logger on
 
-#test_run_saxpy_cts:
-#  stage: test
-#  tags:
-#    - $HOST
-#    - shell
-#  <<: *test_clusters
-#  rules:
-#    - changes:
-#        - .gitlab-ci.yml
-#        - .gitlab/ci/*
-#        - experiments/**
-#        - systems/**
-#        - repo/**
-#        - modifiers/**
-#        - var/**
-#        - lib/**
-#  script:
-#    - . /usr/workspace/benchpark-dev/benchpark-venv/$SYS_TYPE/bin/activate
-#    # Initialize system & experiment
-#    - ./bin/benchpark system init --dest=$HOST-system cts cluster=$HOST
-#    - ./bin/benchpark experiment init --dest=saxpy-benchmark saxpy programming_model=openmp
-#    # Build Workspace
-#    - ./bin/benchpark setup saxpy-benchmark $HOST-system workspace/
-#    # Setup Ramble & Spack
-#    - . workspace/setup.sh
-#    # Setup Workspace
-#    - cd ./workspace/saxpy-benchmark/$SYSTEMHASH/workspace/
-#    - ramble --workspace-dir . --disable-progress-bar --disable-logger workspace setup
-#    # Run Experiments
-#    - ramble --workspace-dir . --disable-progress-bar --disable-logger on
+# new run on tioga, dane, ruby saxpy openmp
+test_run_saxpy_openmp:
+  stage: test
+  tags:
+    - $HOST
+    - shell
+  <<: *test_clusters
+  rules:
+    - changes:
+        - .gitlab-ci.yml
+        - .gitlab/ci/*
+        - experiments/**
+        - systems/**
+        - repo/**
+        - modifiers/**
+        - var/**
+        - lib/**
+  script:
+    - . /usr/workspace/benchpark-dev/benchpark-venv/$SYS_TYPE/bin/activate
+    # Initialize system & experiment
+    - if [ "$HOST" == "tioga" ]; then ./bin/benchpark system init --dest=tioga-system tioga ~gtl; else ./bin/benchpark system init --dest=$HOST-system cts cluster=$HOST; fi
+    - ./bin/benchpark experiment init --dest=saxpy-benchmark saxpy programming_model=openmp
+    # Build Workspace
+    - ./bin/benchpark setup saxpy-benchmark $HOST-system workspace/
+    # Setup Ramble & Spack
+    - . workspace/setup.sh
+    # Setup Workspace
+    - cd ./workspace/saxpy-benchmark/$SYSTEMHASH/workspace/
+    - ramble --workspace-dir . --disable-progress-bar --disable-logger workspace setup
+    # Run Experiments
+    - ramble --workspace-dir . --disable-progress-bar --disable-logger on