Merge "Tweak CI configuration a bit"

devstack/devstackgaterc

@@ -34,6 +34,8 @@ r="$r(?:.*\[.*\bslow\b.*\])"
 r="$r|(?:tempest\.api\.network\.admin\.test_quotas\.QuotasTest\.test_lbaas_quotas.*)"
 r="$r|(?:tempest\.api\.network\.test_load_balancer.*)"
 r="$r|(?:tempest\.scenario\.test_load_balancer.*)"
+r="$r|(?:tempest\.scenario\.test_network_basic_ops.*)"
+r="$r|(?:tempest\.scenario\.test_security_groups_basic_ops.*)"
 r="$r|(?:tempest\.api\.network\.admin\.test_load_balancer.*)"
 r="$r|(?:tempest\.api\.network\.admin\.test_lbaas.*)"
 r="$r|(?:tempest\.api\.network\.test_fwaas_extensions.*)"

devstack/post_test_hook.sh

@@ -5,12 +5,13 @@ set -xe
 GATE_DEST=$BASE/new
 DEVSTACK_PATH=$GATE_DEST/devstack
 
-TEMPEST_DIR="$BASE/new/tempest"
-NETWORKING_ODL_DIR="$BASE/new/networking-odl"
-
 source $DEVSTACK_PATH/functions
 source $DEVSTACK_PATH/localrc
 
+TEMPEST_CODE_DIR="$BASE/new/tempest"
+TEMPEST_DATA_DIR="$DATA_DIR/tempest"
+NETWORKING_ODL_DIR="$BASE/new/networking-odl"
+
 IS_GATE=$(trueorfalse False IS_GATE)
 if [[ "$IS_GATE" == "True" ]]
 then
@@ -18,10 +19,25 @@ then
 fi
 
 owner=stack
-sudo_env="TEMPEST_CONFIG_DIR=$TEMPEST_DIR/etc"
+sudo_env="TEMPEST_CONFIG_DIR=$TEMPEST_CODE_DIR/etc"
 
-cd $TEMPEST_DIR
-sudo chown -R $owner:stack $TEMPEST_DIR
+cd $TEMPEST_CODE_DIR
+sudo chown -R $owner:stack $TEMPEST_CODE_DIR
+sudo mkdir -p "$TEMPEST_DATA_DIR"
+sudo chown -R $owner:stack $TEMPEST_DATA_DIR
+source $DEVSTACK_PATH/openrc admin admin
+
+echo "Some pre-process info"
+neutron net-list
+neutron port-list
+neutron subnet-list
+neutron router-list
 
 echo "Running networking-odl test suite"
-sudo -H -u $owner $sudo_env tools/pretty_tox.sh "$DEVSTACK_GATE_TEMPEST_REGEX"
+sudo -H -u $owner $sudo_env tools/pretty_tox_serial.sh "$DEVSTACK_GATE_TEMPEST_REGEX"
+
+echo "Some post-process info"
+neutron net-list
+neutron port-list
+neutron subnet-list
+neutron router-list