From 8b8928708438a841790e6f8ff3a39d45e6bd7c90 Mon Sep 17 00:00:00 2001 From: kwryankrattiger <80296582+kwryankrattiger@users.noreply.github.com> Date: Fri, 29 Mar 2024 12:32:54 -0500 Subject: [PATCH] CI Reproducer on Metal (#43411) * MacOS image remove requires override syntax * Metal reproducer auto start and cross-platform --- lib/spack/spack/ci.py | 10 ++++++++-- .../gitlab/cloud_pipelines/configs/darwin/ci.yaml | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/spack/spack/ci.py b/lib/spack/spack/ci.py index 5fc5b0946f..d9ed1affca 100644 --- a/lib/spack/spack/ci.py +++ b/lib/spack/spack/ci.py @@ -1994,10 +1994,16 @@ def reproduce_ci_job(url, work_dir, autostart, gpg_url, runtime): ] ) else: - process_command("reproducer", entrypoint_script, work_dir, run=False) + autostart = autostart and setup_result + process_command("reproducer", entrypoint_script, work_dir, run=autostart) inst_list.append("\nOnce on the tagged runner:\n\n") - inst_list.extent([" - Run the reproducer script", f" $ {work_dir}/reproducer.py"]) + inst_list.extent( + [ + " - Run the reproducer script", + f" $ {work_dir}/reproducer.{platform_script_ext}", + ] + ) if not setup_result: inst_list.append("\n - Clone spack and acquire tested commit") diff --git a/share/spack/gitlab/cloud_pipelines/configs/darwin/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/darwin/ci.yaml index 8dfb169a3e..c826c0ea3d 100644 --- a/share/spack/gitlab/cloud_pipelines/configs/darwin/ci.yaml +++ b/share/spack/gitlab/cloud_pipelines/configs/darwin/ci.yaml @@ -1,4 +1,4 @@ ci: pipeline-gen: - build-job-remove: - image: macos-run-on-metal + image:: macos-run-on-metal