From b8e5fc061dcd0fe3ce9d8b44f52c3062ddde50bb Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 20 Mar 2023 10:56:19 +0100 Subject: ci.py: remove redundant wrapper around get (#36188) --- lib/spack/spack/cmd/ci.py | 54 +++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 30 deletions(-) diff --git a/lib/spack/spack/cmd/ci.py b/lib/spack/spack/cmd/ci.py index be081e6870..d96f877d9a 100644 --- a/lib/spack/spack/cmd/ci.py +++ b/lib/spack/spack/cmd/ci.py @@ -33,12 +33,6 @@ def deindent(desc): return desc.replace(" ", "") -def get_env_var(variable_name): - if variable_name in os.environ: - return os.environ.get(variable_name) - return None - - def setup_parser(subparser): setup_parser.parser = subparser subparsers = subparser.add_subparsers(help="CI sub-commands") @@ -268,27 +262,27 @@ def ci_rebuild(args): # Grab the environment variables we need. These either come from the # pipeline generation step ("spack ci generate"), where they were written # out as variables, or else provided by GitLab itself. - pipeline_artifacts_dir = get_env_var("SPACK_ARTIFACTS_ROOT") - job_log_dir = get_env_var("SPACK_JOB_LOG_DIR") - job_test_dir = get_env_var("SPACK_JOB_TEST_DIR") - repro_dir = get_env_var("SPACK_JOB_REPRO_DIR") - local_mirror_dir = get_env_var("SPACK_LOCAL_MIRROR_DIR") - concrete_env_dir = get_env_var("SPACK_CONCRETE_ENV_DIR") - ci_pipeline_id = get_env_var("CI_PIPELINE_ID") - ci_job_name = get_env_var("CI_JOB_NAME") - signing_key = get_env_var("SPACK_SIGNING_KEY") - job_spec_pkg_name = get_env_var("SPACK_JOB_SPEC_PKG_NAME") - job_spec_dag_hash = get_env_var("SPACK_JOB_SPEC_DAG_HASH") - compiler_action = get_env_var("SPACK_COMPILER_ACTION") - spack_pipeline_type = get_env_var("SPACK_PIPELINE_TYPE") - remote_mirror_override = get_env_var("SPACK_REMOTE_MIRROR_OVERRIDE") - remote_mirror_url = get_env_var("SPACK_REMOTE_MIRROR_URL") - spack_ci_stack_name = get_env_var("SPACK_CI_STACK_NAME") - shared_pr_mirror_url = get_env_var("SPACK_CI_SHARED_PR_MIRROR_URL") - rebuild_everything = get_env_var("SPACK_REBUILD_EVERYTHING") + pipeline_artifacts_dir = os.environ.get("SPACK_ARTIFACTS_ROOT") + job_log_dir = os.environ.get("SPACK_JOB_LOG_DIR") + job_test_dir = os.environ.get("SPACK_JOB_TEST_DIR") + repro_dir = os.environ.get("SPACK_JOB_REPRO_DIR") + local_mirror_dir = os.environ.get("SPACK_LOCAL_MIRROR_DIR") + concrete_env_dir = os.environ.get("SPACK_CONCRETE_ENV_DIR") + ci_pipeline_id = os.environ.get("CI_PIPELINE_ID") + ci_job_name = os.environ.get("CI_JOB_NAME") + signing_key = os.environ.get("SPACK_SIGNING_KEY") + job_spec_pkg_name = os.environ.get("SPACK_JOB_SPEC_PKG_NAME") + job_spec_dag_hash = os.environ.get("SPACK_JOB_SPEC_DAG_HASH") + compiler_action = os.environ.get("SPACK_COMPILER_ACTION") + spack_pipeline_type = os.environ.get("SPACK_PIPELINE_TYPE") + remote_mirror_override = os.environ.get("SPACK_REMOTE_MIRROR_OVERRIDE") + remote_mirror_url = os.environ.get("SPACK_REMOTE_MIRROR_URL") + spack_ci_stack_name = os.environ.get("SPACK_CI_STACK_NAME") + shared_pr_mirror_url = os.environ.get("SPACK_CI_SHARED_PR_MIRROR_URL") + rebuild_everything = os.environ.get("SPACK_REBUILD_EVERYTHING") # Construct absolute paths relative to current $CI_PROJECT_DIR - ci_project_dir = get_env_var("CI_PROJECT_DIR") + ci_project_dir = os.environ.get("CI_PROJECT_DIR") pipeline_artifacts_dir = os.path.join(ci_project_dir, pipeline_artifacts_dir) job_log_dir = os.path.join(ci_project_dir, job_log_dir) job_test_dir = os.path.join(ci_project_dir, job_test_dir) @@ -603,8 +597,8 @@ def ci_rebuild(args): broken_spec_path, job_spec_pkg_name, spack_ci_stack_name, - get_env_var("CI_JOB_URL"), - get_env_var("CI_PIPELINE_URL"), + os.environ.get("CI_JOB_URL"), + os.environ.get("CI_PIPELINE_URL"), job_spec.to_dict(hash=ht.dag_hash), ) @@ -704,9 +698,9 @@ def ci_rebuild(args): else: tty.debug("spack install exited non-zero, will not create buildcache") - api_root_url = get_env_var("CI_API_V4_URL") - ci_project_id = get_env_var("CI_PROJECT_ID") - ci_job_id = get_env_var("CI_JOB_ID") + api_root_url = os.environ.get("CI_API_V4_URL") + ci_project_id = os.environ.get("CI_PROJECT_ID") + ci_job_id = os.environ.get("CI_JOB_ID") repro_job_url = "{0}/projects/{1}/jobs/{2}/artifacts".format( api_root_url, ci_project_id, ci_job_id -- cgit v1.2.3-70-g09d2