From 6e477d547d82ef1407c55aec1ec8044303f99de4 Mon Sep 17 00:00:00 2001
From: Harmen Stoppels <harmenstoppels@gmail.com>
Date: Wed, 22 Feb 2023 11:08:32 +0100
Subject: add cdash arg to source build only (#35565)
---
lib/spack/spack/cmd/ci.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
(limited to 'lib')
diff --git a/lib/spack/spack/cmd/ci.py b/lib/spack/spack/cmd/ci.py
index ac40cac697..8e14d7b7ed 100644
--- a/lib/spack/spack/cmd/ci.py
+++ b/lib/spack/spack/cmd/ci.py
@@ -530,18 +530,21 @@ def ci_rebuild(args):
if not verify_binaries:
install_args.append("--no-check-signature")
- if cdash_handler:
- # Add additional arguments to `spack install` for CDash reporting.
- install_args.extend(cdash_handler.args())
-
slash_hash = "/{}".format(job_spec.dag_hash())
+
+ # Arguments when installing dependencies from cache
deps_install_args = install_args
+
+ # Arguments when installing the root from sources
root_install_args = install_args + [
"--keep-stage",
"--only=package",
"--use-buildcache=package:never,dependencies:only",
- slash_hash,
]
+ if cdash_handler:
+ # Add additional arguments to `spack install` for CDash reporting.
+ root_install_args.extend(cdash_handler.args())
+ root_install_args.append(slash_hash)
# ["x", "y"] -> "'x' 'y'"
args_to_string = lambda args: " ".join("'{}'".format(arg) for arg in args)
--
cgit v1.2.3-70-g09d2