From 98d872a774f59ab7633564968a72fc9160450c10 Mon Sep 17 00:00:00 2001 From: Giorgis Georgakoudis Date: Fri, 10 Oct 2025 17:23:36 -0700 Subject: [PATCH 1/2] Remove lassen and unused machines from gitlab ci --- .gitlab/custom-jobs-and-variables.yml | 36 ++------------------ .gitlab/subscribed-pipelines.yml | 48 --------------------------- 2 files changed, 2 insertions(+), 82 deletions(-) diff --git a/.gitlab/custom-jobs-and-variables.yml b/.gitlab/custom-jobs-and-variables.yml index 5af33aee0484..d9a36b152d28 100644 --- a/.gitlab/custom-jobs-and-variables.yml +++ b/.gitlab/custom-jobs-and-variables.yml @@ -12,47 +12,15 @@ variables: # named so that we are sure to retrieve it and avoid collisions. ALLOC_NAME: ${CI_PROJECT_NAME}_ci_${CI_PIPELINE_ID} -# Ruby -# Arguments for top level allocation - RUBY_SHARED_ALLOC: "--mpi=none --exclusive --reservation=ci --time=20 --nodes=1" -# Arguments for job level allocation - RUBY_JOB_ALLOC: "--mpi=none --reservation=ci --nodes=1" -# Add variables that should apply to all the jobs on a machine: -# RUBY_MY_VAR: "..." - -# Poodle -# Arguments for top level allocation - POODLE_SHARED_ALLOC: "--exclusive --partition=pdebug --time=10 --nodes=1" -# Arguments for job level allocation - POODLE_JOB_ALLOC: "--nodes=1" -# Add variables that should apply to all the jobs on a machine: -# POODLE_MY_VAR: "..." - -# Corona -# Arguments for top level allocation -# OPTIONAL: "-o per-resource.count=2" allows to get 2 jobs running on each node. - CORONA_SHARED_ALLOC: "--exclusive --time-limit=15m --nodes=1" -# Arguments for job level allocation - CORONA_JOB_ALLOC: "--nodes=1 --begin-time=+5s" -# Add variables that should apply to all the jobs on a machine: -# CORONA_MY_VAR: "..." - # Tioga # Arguments for top level allocation # OPTIONAL: "-o per-resource.count=2" allows to get 2 jobs running on each node. - TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=15m --nodes=1" +# TIOGA_SHARED_ALLOC: "--queue=pci --exclusive --time-limit=15m --nodes=1" # Arguments for job level allocation - TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s" +# TIOGA_JOB_ALLOC: "--nodes=1 --begin-time=+5s" # Add variables that should apply to all the jobs on a machine: # TIOGA_MY_VAR: "..." -# Lassen uses a different job scheduler (spectrum lsf) that does not allow -# pre-allocation the same way slurm does. Arguments for job level allocation - LASSEN_JOB_ALLOC: "1 -W 30 -q pci" -# Add variables that should apply to all the jobs on a machine: -# LASSEN_MY_VAR: "..." - - # Configuration shared by build and test jobs specific to this project. # Not all configuration can be shared. Here projects can fine tune the # CI behavior. diff --git a/.gitlab/subscribed-pipelines.yml b/.gitlab/subscribed-pipelines.yml index 265a344ba850..c545c8cc9d9f 100644 --- a/.gitlab/subscribed-pipelines.yml +++ b/.gitlab/subscribed-pipelines.yml @@ -29,42 +29,7 @@ # Comment the jobs for machines you don’t need. ### -# RUBY -#ruby-up-check: -# variables: -# CI_MACHINE: "ruby" -# extends: [.machine-check] -# -#ruby-build-and-test: -# variables: -# CI_MACHINE: "ruby" -# needs: [ruby-up-check] -# extends: [.build-and-test] -## POODLE -#poodle-up-check: -# variables: -# CI_MACHINE: "poodle" -# extends: [.machine-check] -# -#poodle-build-and-test: -# variables: -# CI_MACHINE: "poodle" -# needs: [poodle-up-check] -# extends: [.build-and-test] -# -## CORONA -#corona-up-check: -# variables: -# CI_MACHINE: "corona" -# extends: [.machine-check] -# -#corona-build-and-test: -# variables: -# CI_MACHINE: "corona" -# needs: [corona-up-check] -# extends: [.build-and-test] -# ## TIOGA #tioga-up-check: # variables: @@ -76,16 +41,3 @@ # CI_MACHINE: "tioga" # needs: [tioga-up-check] # extends: [.build-and-test] - -# LASSEN -lassen-up-check: - variables: - CI_MACHINE: "lassen" - extends: [.machine-check] - -lassen-build-and-test: - variables: - CI_MACHINE: "lassen" - needs: [lassen-up-check] - extends: [.build-and-test] - From 174b9a46278dad8a97cb36594490fba5becaafb2 Mon Sep 17 00:00:00 2001 From: Giorgis Georgakoudis Date: Fri, 10 Oct 2025 17:37:03 -0700 Subject: [PATCH 2/2] Trigger CI: empty commit