Merge pull request #19 from jackhodgkiss/rally-upgrade

Rally upgrade

Author: jackhodgkiss

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN sed -i s/^deb-src.*// /etc/apt/sources.list
 
@@ -20,8 +20,32 @@ ARG TEMPEST_PLUGIN_MANILA_VERSION=master
 ARG TEMPEST_PLUGIN_MAGNUM_SOURCE=https://github.com/openstack/magnum-tempest-plugin
 ARG TEMPEST_PLUGIN_MAGNUM_VERSION=master
 
+ARG TEMPEST_PLUGIN_BARBICAN_SOURCE=https://github.com/openstack/barbican-tempest-plugin
+ARG TEMPEST_PLUGIN_BARBICAN_VERSION=master
+
+ARG TEMPEST_PLUGIN_CINDER_SOURCE=https://github.com/openstack/cinder-tempest-plugin
+ARG TEMPEST_PLUGIN_CINDER_VERSION=master
+
+ARG TEMPEST_PLUGIN_CLOUDKITTY_SOURCE=https://github.com/openstack/cloudkitty-tempest-plugin
+ARG TEMPEST_PLUGIN_CLOUDKITTY_VERSION=master
+
+ARG TEMPEST_PLUGIN_GLANCE_SOURCE=https://github.com/openstack/glance-tempest-plugin
+ARG TEMPEST_PLUGIN_GLANCE_VERSION=master
+
+ARG TEMPEST_PLUGIN_KEYSTONE_SOURCE=https://github.com/openstack/keystone-tempest-plugin
+ARG TEMPEST_PLUGIN_KEYSTONE_VERSION=master
+
+ARG TEMPEST_PLUGIN_NEUTRON_SOURCE=https://github.com/openstack/neutron-tempest-plugin
+ARG TEMPEST_PLUGIN_NEUTRON_VERSION=master
+
+# Does not work if included.
+# Error output: 'Could not load 'ngs_tests': No module named 'tempest_plugin'
+# ARG TEMPEST_PLUGIN_NETWORKING_GENERIC_SWITCH_SOURCE=https://github.com/openstack/networking-generic-switch
+# ARG TEMPEST_PLUGIN_NETWORKING_GENERIC_SWITCH_VERSION=master
+
 ARG RALLY_OPENSTACK_SOURCE=https://github.com/stackhpc/rally-openstack.git
-ARG RALLY_OPENSTACK_VERSION=feature/non-admin-creds
+# Update after https://github.com/stackhpc/rally-openstack/pull/3/files has been merged.
+ARG RALLY_OPENSTACK_VERSION=non-admin-credentials
 ARG RALLY_OPENSTACK_UPPER_CONSTRAINTS=https://raw.githubusercontent.com/stackhpc/rally-openstack/$RALLY_OPENSTACK_VERSION/upper-constraints.txt
 
 RUN apt-get update && apt-get install --yes sudo python3-dev python3-pip vim git-core crudini jq iputils-ping && \
@@ -38,7 +62,7 @@ COPY ./etc/motd_for_docker /etc/motd
 RUN echo '[ ! -z "$TERM" -a -r /etc/motd ] && cat /etc/motd' >> /etc/bash.bashrc
 
 USER rally
-ENV HOME /home/rally
+ENV HOME=/home/rally
 RUN mkdir -p /home/rally/.rally
 
 RUN touch ~/.rally/rally.conf
@@ -54,6 +78,13 @@ RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_DESIGNATE_SOURCE --ve
 RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_IRONIC_SOURCE --version $TEMPEST_PLUGIN_IRONIC_VERSION
 RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_MANILA_SOURCE --version $TEMPEST_PLUGIN_MANILA_VERSION
 RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_MAGNUM_SOURCE --version $TEMPEST_PLUGIN_MAGNUM_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_BARBICAN_SOURCE --version $TEMPEST_PLUGIN_BARBICAN_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_CINDER_SOURCE --version $TEMPEST_PLUGIN_CINDER_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_CLOUDKITTY_SOURCE --version $TEMPEST_PLUGIN_CLOUDKITTY_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_GLANCE_SOURCE --version $TEMPEST_PLUGIN_GLANCE_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_KEYSTONE_SOURCE --version $TEMPEST_PLUGIN_KEYSTONE_VERSION
+RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_NEUTRON_SOURCE --version $TEMPEST_PLUGIN_NEUTRON_VERSION
+# RUN rally verify add-verifier-ext --source $TEMPEST_PLUGIN_NETWORKING_GENERIC_SWITCH_SOURCE --version $TEMPEST_PLUGIN_NETWORKING_GENERIC_SWITCH_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

etc/motd_for_docker

@@ -16,5 +16,5 @@
 #    * e-mail - [email protected] with tag [Rally] in     #
 #      subject                                                                #
 #    * Gitter - https://gitter.im/xRally/Lobby room                           #
-#    * irc - "#openstack-rally" channel at freenode.net                       #
+#    * irc - "#openstack-rally" channel at oftc.net                           #
 ###############################################################################