[Darshan-commits] [Git][darshan/darshan][master] 2 commits: test stage should actually be shell, not batch

[Shane Snyder]

Shane Snyder pushed to branch master at darshan / darshan


Commits:
3b575b42 by Shane Snyder at 2020-04-20T09:33:35-05:00
test stage should actually be shell, not batch

we invoke batch scheduler directly in our scripts

- - - - -
7dfbddce by Shane Snyder at 2020-04-20T09:33:35-05:00
Merge branch 'dev-gitlab-ci' into 'master'

add GitLab CI hooks

See merge request darshan/darshan!45
- - - - -


7 changed files:

- .gitlab-ci.yml
- darshan-test/automated/common/build.sh
- darshan-test/automated/common/configure.sh
- darshan-test/automated/common/setup.sh
- darshan-test/automated/generic/configure.sh
- darshan-test/automated/theta/configure.sh
- darshan-test/regression/cray-module-alcf/runjob.sh


Changes:

=====================================
.gitlab-ci.yml
=====================================
@@ -1,6 +1,5 @@
 variables:
-  ANL_THETA_SCHEDULER_PARAMETERS: "-A radix-io"
-  ANL_THETA_PROJECT_SERVICE_USER: "darshan"
+  ANL_THETA_PROJECT_SERVICE_USER: "ecpcscstdm"
 
 stages:
   - build
@@ -11,24 +10,46 @@ build_darshan:
     - shell
     - ecp-theta
 
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "web"'
+      when: always
+    - if: '$CI_PIPELINE_SOURCE == "schedules"'
+      when: always
+    - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'
+      when: always
+
   stage: build
 
   script:
     - source darshan-test/automated/common/setup.sh
-    - cat setup-result.xml
-    - source darshan-test/automated/common/configure.sh
-#    - source darshan-test/automated/common/build.sh
+    - source darshan-test/automated/theta/configure.sh
+    - source darshan-test/automated/common/build.sh
+
+  artifacts:
+    paths:
+      - install/
 
-#.test_darshan:
-#  variables:
-#    # XXX this info is hard-coded in our regression scripts
-#    #SCHEDULER_PARAMETERS: "-A radix-io -n 1  -t 10 -q default"
+test_darshan:
+  tags:
+    - shell
+    - ecp-theta
 
-#  tags:
-#    - batch
-#    - ecp-theta
+  rules:
+    - if: '$CI_PIPELINE_SOURCE == "web" && $RUN_TESTS == "true"'
+      when: on_success
+    - if: '$CI_PIPELINE_SOURCE == "schedules" && $RUN_TESTS == "true"'
+      when: on_success
 
-#  stage: test
+  stage: test
 
-#  script:
-#    - darshan-test/regression/run-all.sh install scratch cray-module-alcf
+  script:
+    - ls $PWD/install
+    - ls $PWD/install/bin
+    - darshan-test/regression/run-all.sh $PWD/install $PWD/scratch cray-module-alcf
+
+  artifacts:
+    paths:
+        - $PWD/scratch/*.darshan
+        - $PWD/scratch/*.debuglog
+        - $PWD/scratch/*.out
+        - $PWD/scratch/*.err


=====================================
darshan-test/automated/common/build.sh
=====================================
@@ -40,4 +40,4 @@ echo "
 </testsuites>
 " > build-result.xml
 
-exit $fcount
+return $fcount


=====================================
darshan-test/automated/common/configure.sh
=====================================
@@ -18,4 +18,4 @@ else
   status=100
 fi
 
-exit $status
+return $status


=====================================
darshan-test/automated/common/setup.sh
=====================================
@@ -26,4 +26,5 @@ echo "
   </testsuite>
 </testsuites>
 " > setup-result.xml
-exit $status
+
+return $status


=====================================
darshan-test/automated/generic/configure.sh
=====================================
@@ -39,4 +39,5 @@ echo "
   </testsuite>
 </testsuites>
 " > configure-result.xml
-exit $fcount
+
+return $fcount


=====================================
darshan-test/automated/theta/configure.sh
=====================================
@@ -45,4 +45,5 @@ echo "
   </testsuite>
 </testsuites>
 " > configure-result.xml
-exit $fcount
+
+return $fcount


=====================================
darshan-test/regression/cray-module-alcf/runjob.sh
=====================================
@@ -6,7 +6,7 @@ if [ -n "${DXT_ENABLE_IO_TRACE+defined}" ]; then
 fi
 
 # submit job and get job id
-jobid=`qsub --env DARSHAN_LOGFILE=$DARSHAN_LOGFILE --env DARSHAN_DEFAULT_NPROCS=$DARSHAN_DEFAULT_NPROCS $DXT_ENV --proccount $DARSHAN_DEFAULT_NPROCS -A radix-io -q debug-cache-quad -t 20 -n 1 --output $DARSHAN_TMP/$$-tmp.out --error $DARSHAN_TMP/$$-tmp.err --debuglog $DARSHAN_TMP/$$-tmp.debuglog $DARSHAN_TESTDIR/$DARSHAN_PLATFORM/cobalt-submit.sh "$@"`
+jobid=`qsub --env DARSHAN_LOGFILE=$DARSHAN_LOGFILE --env DARSHAN_DEFAULT_NPROCS=$DARSHAN_DEFAULT_NPROCS $DXT_ENV --proccount $DARSHAN_DEFAULT_NPROCS -A CSC250STDM12 -q debug-cache-quad -t 20 -n 1 --output $DARSHAN_TMP/$$-tmp.out --error $DARSHAN_TMP/$$-tmp.err --debuglog $DARSHAN_TMP/$$-tmp.debuglog $DARSHAN_TESTDIR/$DARSHAN_PLATFORM/cobalt-submit.sh "$@"`
 
 if [ $? -ne 0 ]; then
         echo "Error: failed to qsub $@"



View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/bbdfb4f9dd0f86dcb3ce452fba4addbff9c9e53f...7dfbddce4d4e467594162c7a9b3c8a4c74aeca64

-- 
View it on GitLab: https://xgitlab.cels.anl.gov/darshan/darshan/compare/bbdfb4f9dd0f86dcb3ce452fba4addbff9c9e53f...7dfbddce4d4e467594162c7a9b3c8a4c74aeca64
You're receiving this email because of your account on xgitlab.cels.anl.gov.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mcs.anl.gov/pipermail/darshan-commits/attachments/20200420/e63f279b/attachment-0001.html>