Merge pull request #321 from antonym/fix_tempest

Enable tempest for all, drop tempest ips
rcbops · Jan 29, 2019 · 9ac8582 · 9ac8582
2 parents ec4284c + b8467be
commit 9ac8582
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/gating/check/run b/gating/check/run
@@ -114,7 +114,7 @@ function post_upgrade {
 }
 
 function run_tempest {
-  if [ "{$RE_JOB_UPGRADE_TO}" == "queens" ]; then
+  if [[ "${RE_JOB_UPGRADE_ACTION}" == "inc" ]]; then
     sudo -H --preserve-env ./tests/run-tempest.sh
   fi
 }

diff --git a/tests/run-tempest.sh b/tests/run-tempest.sh
@@ -35,8 +35,6 @@ cat > /etc/openstack_deploy/user_rpco_tempest.yml <<EOF
 ---
 tempest_install: yes
 tempest_run: yes
-tempest_public_subnet_cidr: 172.29.248.0/22
-tempest_public_subnet_allocation_pools: "172.29.249.110-172.29.249.200"
 # RI-357 Tempest Overrides
 tempest_test_whitelist:
   - "{{ (tempest_service_available_ceilometer | bool) | ternary('tempest.api.telemetry', '') }}"
@@ -47,7 +45,13 @@ tempest_test_whitelist:
 #  - "{{ (tempest_volume_backup_enabled | bool) | ternary('tempest.api.volume.admin.test_volumes_backup', '') }}"
 EOF
 
-pushd /opt/openstack-ansible/playbooks
+if [ -d "/opt/openstack-ansible/playbooks" ]; then
+  export TEMPEST_DIR="/opt/openstack-ansible/playbooks"
+elif [ -d "/opt/rpc-openstack/openstack-ansible/playbooks" ]; then
+  export TEMPEST_DIR="/opt/rpc-openstack/openstack-ansible/playbooks"
+fi
+
+pushd ${TEMPEST_DIR}
   # TODO: establish any overrides
   # install and run tempest
   openstack-ansible os-tempest-install.yml --skip-tags=rsyslog -vv

diff --git a/tests/upgrade-mnaio.sh b/tests/upgrade-mnaio.sh
@@ -53,3 +53,12 @@ ${MNAIO_SSH} "source /opt/rpc-upgrades/RE_ENV; \
               pushd /opt/rpc-upgrades; \
               tests/qc-test.sh"
 echo "QC Tests completed..."
+
+if [[ "${RE_JOB_UPGRADE_ACTION}" == "inc" ]]; then
+  # Run Tempest Tests
+  ${MNAIO_SSH} "source /opt/rpc-upgrades/RE_ENV; \
+                source /opt/rpc-upgrades/tests/ansible-env.rc; \
+                pushd /opt/rpc-upgrades; \
+                tests/run-tempest.sh"
+  echo "Tempest Tests completed..."
+fi