zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: add all locally computed hashes as job variables (#24359)

Browse Source
This commit is contained in:
Scott Wittenburg
2021-06-17 03:37:31 -06:00
committed by GitHub
parent 986776c937
commit ee9b1a6ea5
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spack/spack/ci.py
View File

@@ -706,14 +706,17 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file,
root_spec = spec_record['rootSpec'] root_spec = spec_record['rootSpec']
pkg_name = pkg_name_from_spec_label(spec_label) pkg_name = pkg_name_from_spec_label(spec_label)
release_spec = root_spec[pkg_name] 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. # Check if this spec is in our list of known failures.
if broken_specs_url: if broken_specs_url:
full_hash = release_spec.full_hash() broken_spec_path = url_util.join(
broken_spec_path = url_util.join(broken_specs_url, full_hash) broken_specs_url, release_spec_full_hash)
if web_util.url_exists(broken_spec_path): if web_util.url_exists(broken_spec_path):
known_broken_specs_encountered.append('{0} ({1})'.format( known_broken_specs_encountered.append('{0} ({1})'.format(
release_spec, full_hash)) release_spec, release_spec_full_hash))
runner_attribs = find_matching_config( runner_attribs = find_matching_config(
release_spec, gitlab_ci) release_spec, gitlab_ci)
@@ -775,7 +778,9 @@ def generate_gitlab_ci_yaml(env, print_summary, output_file,
job_vars = { job_vars = {
'SPACK_ROOT_SPEC': format_root_spec( 'SPACK_ROOT_SPEC': format_root_spec(
root_spec, main_phase, strip_compilers), 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_JOB_SPEC_PKG_NAME': release_spec.name,
'SPACK_COMPILER_ACTION': compiler_action 'SPACK_COMPILER_ACTION': compiler_action
} }