Merge pull request openstack-k8s-operators#175 from lpiwowar/feature/rpms

Install extra rpms

Author: openshift-merge-bot[bot]

Diff for: container-images/tcib/base/os/tempest/run_tempest.sh

@@ -147,6 +147,8 @@ TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL="${TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL:-}"
 TEMPEST_EXTERNAL_PLUGIN_REFSPEC="${TEMPEST_EXTERNAL_PLUGIN_REFSPEC:-}"
 TEMPEST_EXTERNAL_PLUGIN_DIR=/var/lib/tempest/external-plugins
 
+TEMPEST_EXTRA_RPMS="${TEMPEST_EXTRA_RPMS:-}"
+
 TEMPEST_EXTRA_IMAGES_URL="${TEMPEST_EXTRA_IMAGES_URL:-}"
 TEMPEST_EXTRA_IMAGES_DISK_FORMAT="${TEMPEST_EXTRA_IMAGES_DISK_FORMAT:-}"
 TEMPEST_EXTRA_IMAGES_OS_CLOUD="${TEMPEST_EXTRA_IMAGES_OS_CLOUD:-}"
@@ -167,6 +169,7 @@ IFS=","
 read -ra TEMPEST_EXTERNAL_PLUGIN_GIT_URL <<< $TEMPEST_EXTERNAL_PLUGIN_GIT_URL
 read -ra TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL <<< $TEMPEST_EXTERNAL_PLUGIN_CHANGE_URL
 read -ra TEMPEST_EXTERNAL_PLUGIN_REFSPEC <<< $TEMPEST_EXTERNAL_PLUGIN_REFSPEC
+read -ra TEMPEST_EXTRA_RPMS <<< $TEMPEST_EXTRA_RPMS
 
 read -ra TEMPEST_EXTRA_IMAGES_URL <<< ${TEMPEST_EXTRA_IMAGES_URL:-}
 read -ra TEMPEST_EXTRA_IMAGES_DISK_FORMAT <<< $TEMPEST_EXTRA_IMAGES_DISK_FORMAT
@@ -313,6 +316,9 @@ function run_rpm_tempest {
     tempest init openshift
     pushd $TEMPEST_DIR
 
+    # Install additional plugins from .rpms plus their dependencies
+    [ ${#TEMPEST_EXTRA_RPMS[@]} -ne 0 ] && sudo dnf install -y ${TEMPEST_EXTRA_RPMS[@]}
+
     discover-tempest-config ${TEMPESTCONF_ARGS} ${TEMPESTCONF_OVERRIDES}
     tempest run ${TEMPEST_ARGS}
     RETURN_VALUE=$?