Merge pull request #5 from stackhpc/feature/plugins

Add commonly used tempest plugins into image

Author: jovial

Dockerfile

@@ -2,6 +2,18 @@ FROM ubuntu:20.04
 
 RUN sed -i s/^deb-src.*// /etc/apt/sources.list
 
+ARG TEMPEST_SOURCE=https://github.com/openstack/tempest
+ARG TEMPEST_VERSION=master
+
+ARG TEMPEST_PLUGIN_OCTAVIA_SOURCE=https://github.com/openstack/octavia-tempest-plugin
+ARG TEMPEST_PLUGIN_OCTAVIA_VERSION=master
+
+ARG TEMPEST_PLUGIN_DESIGNATE_SOURCE=https://github.com/openstack/designate-tempest-plugin
+ARG TEMPEST_PLUGIN_DESIGNATE_VERSION=master
+
+ARG TEMPEST_PLUGIN_IRONIC_SOURCE=https://github.com/openstack/ironic-tempest-plugin
+ARG TEMPEST_PLUGIN_IRONIC_VERSION=master
+
 RUN apt-get update && apt-get install --yes sudo python3-dev python3-pip vim git-core crudini jq iputils-ping && \
     apt clean && \
     pip3 --no-cache-dir install --upgrade pip setuptools && \
@@ -25,10 +37,12 @@ RUN crudini --set ~/.rally/rally.conf database connection sqlite:////home/rally/
 
 RUN rally db recreate
 
-# Docker volumes have specific behavior that allows this construction to work.
-# Data generated during the image creation is copied to volume only when it's
-# attached for the first time (volume initialization)
-RUN rally verify create-verifier --name default --type tempest
+RUN rally verify create-verifier --name default --type tempest --source $TEMPEST_SOURCE --version $TEMPEST_VERSION
+
+# For simplicitiy, always install common extensions
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_OCTAVIA_SOURCE --version $TEMPEST_PLUGIN_OCTAVIA_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_DESIGNATE_SOURCE --version $TEMPEST_PLUGIN_DESIGNATE_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_IRONIC_SOURCE --version $TEMPEST_PLUGIN_IRONIC_VERSION
 
 COPY bin/rally-verify-wrapper.sh /usr/bin/rally-verify-wrapper.sh
 COPY bin/rally-extract-tests.sh /usr/bin/rally-extract-tests.sh

bin/rally-normalize.py

@@ -74,15 +74,14 @@ def _form_test_id_mappings(self, test_list):
         """
         test_mappings = {}
         for testcase in test_list:
-            if testcase.startswith("tempest"):
-                # Search for any strings like '[smoke, gate]' in the test ID.
-                match = re.search('(\[.*\])', testcase)
-
-                if match:
-                    testcase = re.sub('\[.*\]', '', testcase)
-                    test_mappings[testcase] = match.group(1)
-                else:
-                    test_mappings[testcase] = ""
+            # Search for any strings like '[smoke, gate]' in the test ID.
+            match = re.search('(\[.*\])', testcase)
+
+            if match:
+                testcase = re.sub('\[.*\]', '', testcase)
+                test_mappings[testcase] = match.group(1)
+            else:
+                test_mappings[testcase] = ""
         return test_mappings
 
     def _get_base_test_ids_from_list_file(self, list_location):

bin/rally-verify-wrapper.sh

@@ -10,17 +10,6 @@
 set -eux
 
 artifacts_dir=/home/rally/artifacts
-tempest_source_default="--source /opt/tempest"
-
-tempest_source="$tempest_source_default"
-if [ ! -z ${TEMPEST_SOURCE:+x} ]; then
-    tempest_source="--source $TEMPEST_SOURCE"
-fi
-
-tempest_version=""
-if [ ! -z ${TEMPEST_VERSION:+x} ]; then
-    tempest_version="--version $TEMPEST_VERSION"
-fi
 
 if [ ! -z ${TEMPEST_LOAD_LIST:+x} ]; then
     echo "$TEMPEST_LOAD_LIST" > ~/tempest-load-list
@@ -86,10 +75,6 @@ crudini --set ~/.rally/rally.conf openstack flavor_ref_alt_disk 1
 
 rally deployment create --fromenv --name openstack
 
-if [ "$tempest_source" != "$tempest_source_default" ] || [ "$tempest_version" != "" ]; then
-    rally verify create-verifier --name tempest --type tempest $tempest_source $tempest_version
-fi
-
 if [ -f ~/tempest-overrides.conf ]; then
     rally verify configure-verifier --reconfigure --extend ~/tempest-overrides.conf
 fi