Use pdebug queue for quartz allocation, print host in build_src.py sc…

…ript (#1098)
LLNL · May 30, 2023 · b1c06e2 · b1c06e2
1 parent 8cbf7b1
commit b1c06e2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -29,7 +29,7 @@ stages:
 .src_build_script:
   script:
     # Use pre-existing allocation if any
-    - JOBID=$(if [[ "$SYS_TYPE" == "toss_3_x86_64_ib" ]]; then squeue -h --name=${PROJECT_ALLOC_NAME} --format=%A; fi)
+    - export JOBID=$(if [[ "$SYS_TYPE" == "toss_4_x86_64_ib" ]]; then squeue -h --name=${PROJECT_ALLOC_NAME} --format=%A; fi)
     - ASSIGN_ID=$(if [[ -n "${JOBID}" ]]; then echo "--jobid=${JOBID}"; fi)
     # BUILD + TEST
     - echo -e "\e[0Ksection_start:$(date +%s):src_build_and_test\r\e[0KSource Build and Test ${CI_PROJECT_NAME}"

diff --git a/.gitlab/build_quartz.yml b/.gitlab/build_quartz.yml
@@ -28,7 +28,7 @@ quartz_allocate:
   script:
     # Use when ellastic ci is on quartz or we go back to ruby
     #- salloc --reservation=ci --qos=ci_ruby -N 1 -c 36 -t 60 --no-shell --job-name=${PROJECT_ALLOC_NAME}
-    - salloc -N 1 -c 36 -t 60 --no-shell --job-name=${PROJECT_ALLOC_NAME}
+    - salloc -N 1 -c 36 -t 60 -p pdebug --no-shell --job-name=${PROJECT_ALLOC_NAME}
   needs: []
 
 ####
@@ -50,7 +50,7 @@ quartz_release:
   variables:
     # Use when ellastic ci is on quartz or we go back to ruby
     # ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 "
-    ALLOC_COMMAND: "srun -t 60 -N 1 "
+    ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug"
   extends: [.src_build_script, .on_quartz, .src_workflow]
   needs: [quartz_allocate]
 
@@ -59,7 +59,7 @@ quartz_release:
   variables:
     # Use when ellastic ci is on quartz or we go back to ruby
     # ALLOC_COMMAND: "srun --reservation=ci --qos=ci_ruby -t 60 -N 1 "
-    ALLOC_COMMAND: "srun -t 60 -N 1 "
+    ALLOC_COMMAND: "srun -t 60 -N 1 -p pdebug"
   extends: [.full_build_script, .on_quartz, .full_workflow]
   needs: []
 

diff --git a/scripts/llnl_scripts/build_src.py b/scripts/llnl_scripts/build_src.py
@@ -152,6 +152,10 @@ def main():
                         print("[ERROR: Could not find any host-configs in any known path. Try giving fully qualified path.]")
                         return 1
 
+            print("[build info]")
+            binfo_str = json.dumps(build_info(),indent=2)
+            print(binfo_str)
+
             test_root = get_build_and_test_root(repo_dir, timestamp)
             test_root = "{0}_{1}".format(test_root, hostconfig.replace(".cmake", "").replace("@","_"))
             os.mkdir(test_root)

diff --git a/scripts/llnl_scripts/llnl_lc_build_tools.py b/scripts/llnl_scripts/llnl_lc_build_tools.py
@@ -71,6 +71,7 @@ def build_info():
     res["built_from_branch"] = "unknown"
     res["built_from_sha1"]   = "unknown"
     res["platform"] = get_platform()
+    res["hostname"] = "unknown"
     rc, out = sexe('git branch -a | grep \"*\"',ret_output=True,error_prefix="WARNING:")
     out = out.strip()
     if rc == 0 and out != "":
@@ -79,6 +80,10 @@ def build_info():
     out = out.strip()
     if rc == 0 and out != "":
         res["built_from_sha1"] = out
+    rc, out = sexe('hostname',ret_output=True,error_prefix="WARNING:")
+    out = out.strip()
+    if rc == 0 and out != "":
+        res["hostname"] = out
     return res