From a59d25923757d44297ea6cead476cfe2c9295b36 Mon Sep 17 00:00:00 2001
From: Tomas Cere <tomas.cere@pantheon.tech>
Date: Wed, 8 Sep 2021 16:50:19 +0200
Subject: [PATCH] Add karaf_version param to mri-stage

Looks like this param is needed since its used
to lookup the actual artifact id, which is used
to build up the correct bundle_url.

Signed-off-by: Tomas Cere <tomas.cere@pantheon.tech>
Change-Id: I342da21a119b40530b43d83421e1e200fe6a58c9
---
 jjb/releng-maven-mri-stage.sh   | 1 +
 jjb/releng-maven-mri-stage.yaml | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/jjb/releng-maven-mri-stage.sh b/jjb/releng-maven-mri-stage.sh
index 9dd7b4e6c..9dfb7859e 100644
--- a/jjb/releng-maven-mri-stage.sh
+++ b/jjb/releng-maven-mri-stage.sh
@@ -29,4 +29,5 @@ echo "Bundle url is ${BUNDLE_URL}"
 # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus
 cat > "${WORKSPACE}/maven-staged-bundle.env" <<EOF
 BUNDLE_URL=${BUNDLE_URL}
+KARAF_VERSION=${KARAF_VERSION}
 EOF
diff --git a/jjb/releng-maven-mri-stage.yaml b/jjb/releng-maven-mri-stage.yaml
index cd957c047..d08c7b4c2 100644
--- a/jjb/releng-maven-mri-stage.yaml
+++ b/jjb/releng-maven-mri-stage.yaml
@@ -131,6 +131,8 @@
           mvn-params: "{mvn-params}"
           mvn-version: "{mvn-version}"
           staging-profile-id: "{staging-profile-id}"
+      - distribution-karaf-version:
+          karaf-version: "{karaf-version}"
       - bool:
           name: MAVEN_VERSIONS_PLUGIN
           default: "{maven-versions-plugin}"
-- 
2.36.6