Skip to content

Commit 986d586

Browse files
committed
[Tempest] Install extra rpms
This patch introduces TEMPEST_EXTRA_RPMS variable that accepts a comma-separated list of URLs that point to RPMs that should be installed before the execution of tempest.
1 parent ca08676 commit 986d586

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

container-images/tcib/base/os/tempest/run_tempest.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,8 @@ TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL="${TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL:-}"
147147
TEMPEST_EXTERNAL_PLUGIN_REFSPEC="${TEMPEST_EXTERNAL_PLUGIN_REFSPEC:-}"
148148
TEMPEST_EXTERNAL_PLUGIN_DIR=/var/lib/tempest/external-plugins
149149

150+
TEMPEST_EXTRA_RPMS="${TEMPEST_EXTRA_RPMS:-}"
151+
150152
TEMPEST_EXTRA_IMAGES_URL="${TEMPEST_EXTRA_IMAGES_URL:-}"
151153
TEMPEST_EXTRA_IMAGES_DISK_FORMAT="${TEMPEST_EXTRA_IMAGES_DISK_FORMAT:-}"
152154
TEMPEST_EXTRA_IMAGES_OS_CLOUD="${TEMPEST_EXTRA_IMAGES_OS_CLOUD:-}"
@@ -167,6 +169,7 @@ IFS=","
167169
read -ra TEMPEST_EXTERNAL_PLUGIN_GIT_URL <<< $TEMPEST_EXTERNAL_PLUGIN_GIT_URL
168170
read -ra TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL <<< $TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL
169171
read -ra TEMPEST_EXTERNAL_PLUGIN_REFSPEC <<< $TEMPEST_EXTERNAL_PLUGIN_REFSPEC
172+
read -ra TEMPEST_EXTRA_RPMS <<< $TEMPEST_EXTRA_RPMS
170173

171174
read -ra TEMPEST_EXTRA_IMAGES_URL <<< ${TEMPEST_EXTRA_IMAGES_URL:-}
172175
read -ra TEMPEST_EXTRA_IMAGES_DISK_FORMAT <<< $TEMPEST_EXTRA_IMAGES_DISK_FORMAT
@@ -313,6 +316,9 @@ function run_rpm_tempest {
313316
tempest init openshift
314317
pushd $TEMPEST_DIR
315318

319+
# Install additional plugins from .rpms plus their dependencies
320+
[ ${#TEMPEST_EXTRA_RPMS[@]} -ne 0 ] && sudo dnf install -y ${TEMPEST_EXTRA_RPMS[@]}
321+
316322
discover-tempest-config ${TEMPESTCONF_ARGS} ${TEMPESTCONF_OVERRIDES}
317323
tempest run ${TEMPEST_ARGS}
318324
RETURN_VALUE=$?

0 commit comments

Comments
 (0)