From de6fb705c7e195f976e1148b9471071d4106e546 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Fri, 19 Jul 2024 08:44:58 +0200 Subject: [PATCH] drop last remains of el8-special-cases in our pipelines --- theforeman.org/pipelines/lib/foreman.groovy | 6 +----- theforeman.org/pipelines/lib/obal.groovy | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/theforeman.org/pipelines/lib/foreman.groovy b/theforeman.org/pipelines/lib/foreman.groovy index 1f04fc5f..c0dad077 100644 --- a/theforeman.org/pipelines/lib/foreman.groovy +++ b/theforeman.org/pipelines/lib/foreman.groovy @@ -61,11 +61,7 @@ production: } def filter_package_json(ruby) { - if (env.NODE_LABELS.contains('el8')) { - python = 'python3.12' - } else { - python = 'python3' - } + python = 'python3' sh "${python} script/filter-package-json.py" diff --git a/theforeman.org/pipelines/lib/obal.groovy b/theforeman.org/pipelines/lib/obal.groovy index ae37020b..0d6863a7 100644 --- a/theforeman.org/pipelines/lib/obal.groovy +++ b/theforeman.org/pipelines/lib/obal.groovy @@ -7,11 +7,7 @@ def obal(args) { packages = packages.join(' ') } - if (env.NODE_LABELS.contains('el8')) { - python = 'python3.12' - } else { - python = 'python3' - } + python = 'python3' def cmd = "${python} -m obal ${args.action} ${packages}"