From ee9b1a6ea5c99645e4c5a0ebe47a18bc27b5879b Mon Sep 17 00:00:00 2001 From: Scott Wittenburg Date: Thu, 17 Jun 2021 03:37:31 -0600 Subject: ci: add all locally computed hashes as job variables (#24359) --- lib/spack/spack/ci.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index cba5cb3421..e966a5a970 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -706,14 +706,17 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file, root_spec = spec_record['rootSpec'] pkg_name = pkg_name_from_spec_label(spec_label) release_spec = root_spec[pkg_name] + release_spec_full_hash = release_spec.full_hash() + release_spec_dag_hash = release_spec.dag_hash() + release_spec_build_hash = release_spec.build_hash() # Check if this spec is in our list of known failures. if broken_specs_url: - full_hash = release_spec.full_hash() - broken_spec_path = url_util.join(broken_specs_url, full_hash) + broken_spec_path = url_util.join( + broken_specs_url, release_spec_full_hash) if web_util.url_exists(broken_spec_path): known_broken_specs_encountered.append('{0} ({1})'.format( - release_spec, full_hash)) + release_spec, release_spec_full_hash)) runner_attribs = find_matching_config( release_spec, gitlab_ci) @@ -775,7 +778,9 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file, job_vars = { 'SPACK_ROOT_SPEC': format_root_spec( root_spec, main_phase, strip_compilers), - 'SPACK_JOB_SPEC_DAG_HASH': release_spec.dag_hash(), + 'SPACK_JOB_SPEC_DAG_HASH': release_spec_dag_hash, + 'SPACK_JOB_SPEC_BUILD_HASH': release_spec_build_hash, + 'SPACK_JOB_SPEC_FULL_HASH': release_spec_full_hash, 'SPACK_JOB_SPEC_PKG_NAME': release_spec.name, 'SPACK_COMPILER_ACTION': compiler_action } -- cgit v1.2.3-70-g09d2