From 8e047b3be048e127eafc3eea6fda8d2063ca2fb0 Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Mon, 27 May 2024 18:03:27 +0200 Subject: [PATCH] correctly pass foreman_expected_version to pipelines Fixes: f35f1a3889a993c5e2f83e27773e04f1367dc4fe --- centos.org/pipelines/lib/foremanDuffyJob.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/centos.org/pipelines/lib/foremanDuffyJob.groovy b/centos.org/pipelines/lib/foremanDuffyJob.groovy index adb5c1e8..101486fe 100644 --- a/centos.org/pipelines/lib/foremanDuffyJob.groovy +++ b/centos.org/pipelines/lib/foremanDuffyJob.groovy @@ -88,7 +88,7 @@ pipeline { def username = "pipe-${os}-${action}" def boxname = "${username}@duffy_box" branches[name] = { - def playBook = pipelineVars(action: action, type: params.type, version: params.version, os: os, extra_vars: ['expected_version': params.expected_version ?: '']) + def playBook = pipelineVars(action: action, type: params.type, version: params.version, os: os, extra_vars: ['foreman_expected_version': params.expected_version ?: '']) def extra_vars = buildExtraVars(extraVars: playBook['extraVars']) def playbooks = duffy_ssh("ls forklift/pipelines/${playBook['pipeline']}", boxname, './', true) playbooks = playbooks.split("\n") @@ -118,7 +118,7 @@ pipeline { def username = "pipe-${os}-${action}" def boxname = "${username}@duffy_box" branches[name] = { - def playBook = pipelineVars(action: action, type: params.type, version: params.version, os: os, extra_vars: ['expected_version': params.expected_version ?: '']) + def playBook = pipelineVars(action: action, type: params.type, version: params.version, os: os, extra_vars: ['foreman_expected_version': params.expected_version ?: '']) def extra_vars = buildExtraVars(extraVars: playBook['extraVars']) try { duffy_ssh("source otel_env && cd forklift && ansible-playbook playbooks/collect_debug.yml --limit '${playBook['boxes'].join(',')}' ${extra_vars}", boxname, './')