From 5a16fac513592ed3ba053d26d566c61357c71198 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Fri, 24 Feb 2017 14:29:29 -0500
Subject: [PATCH] upgrades: run pingtest at the very end of the CI job

When upgrade has been completed, run a pingtest to check if we can
actually consume the OpenStack Cloud.

That is a first iteration. The next will be:
1. Run pingtest just before the upgrade
2. Verify that resources survived to the upgrade
3. Run pingtest again when we know resources survived

Change-Id: I83f45efd0b4608ec29489b8f8e717945b22469d4
---
 scripts/deploy.sh | 56 +++++++++++++++++++++++------------------------
 toci_gate_test.sh |  1 -
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 87edff322..73e228520 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -399,6 +399,34 @@ if [ -f ~/overcloudrc ]; then
     source ~/overcloudrc
 fi
 
+if [ "$OVERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
+    source ~/stackrc
+    # Set deploy args for stable deployment:
+    # We have to use the backward compatible
+    if [ ! -z $UPGRADE_ENV ]; then
+        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $UPGRADE_ENV"
+    fi
+    # update-from-deployed-server-$UPGRADE_RELEASE.yaml environment when upgrading from
+    # $UPGRADE_RELEASE.
+    export OVERCLOUD_DEPLOY_ARGS="$CURRENT_OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/updates/update-from-deployed-server-$UPGRADE_RELEASE.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/services/sahara.yaml"
+    if [ ! -z $UPGRADE_ENV ]; then
+        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $UPGRADE_ENV"
+    fi
+    echo_vars_to_deploy_env
+    if [ "$MULTINODE" = "1" ]; then
+        /usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config-22.log &
+    fi
+    # We run basic sanity tests before/after, which includes creating some resources which
+    # must survive the upgrade.  The upgrade is performed in two steps, even though this
+    # is an all-in-one test, as this is close to how a real deployment with computes would
+    # be upgraded.
+    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-sanity --skip-sanitytest-cleanup
+    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-upgrade
+    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-sanity --skip-sanitytest-create --skip-sanitytest-cleanup
+    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-upgrade-converge
+    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-sanity --skip-sanitytest-create
+fi
+
 if [ $RUN_PING_TEST == 1 ] ; then
     start_metric "tripleo.${STABLE_RELEASE:-master}.${TOCI_JOBTYPE}.overcloud.ping_test.seconds"
     OVERCLOUD_PINGTEST_OLD_HEATCLIENT=0 $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-pingtest $OVERCLOUD_PINGTEST_ARGS
@@ -437,31 +465,3 @@ if [ "$UNDERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
     layer_ci_repo
     $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --undercloud-upgrade 2>&1 | ts '%Y-%m-%d %H:%M:%S.000 |' | sudo dd of=/var/log/undercloud_upgrade.txt || (tail -n 50 /var/log/undercloud_upgrade.txt && false)
 fi
-
-if [ "$OVERCLOUD_MAJOR_UPGRADE" == 1 ] ; then
-    source ~/stackrc
-    # Set deploy args for stable deployment:
-    # We have to use the backward compatible
-    if [ ! -z $UPGRADE_ENV ]; then
-        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $UPGRADE_ENV"
-    fi
-    # update-from-deployed-server-$UPGRADE_RELEASE.yaml environment when upgrading from
-    # $UPGRADE_RELEASE.
-    export OVERCLOUD_DEPLOY_ARGS="$CURRENT_OVERCLOUD_DEPLOY_ARGS -e /usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/updates/update-from-deployed-server-$UPGRADE_RELEASE.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/services/sahara.yaml"
-    if [ ! -z $UPGRADE_ENV ]; then
-        export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $UPGRADE_ENV"
-    fi
-    echo_vars_to_deploy_env
-    if [ "$MULTINODE" = "1" ]; then
-        /usr/share/openstack-tripleo-heat-templates/deployed-server/scripts/get-occ-config.sh 2>&1 | sudo dd of=/var/log/deployed-server-os-collect-config-22.log &
-    fi
-    # We run basic sanity tests before/after, which includes creating some resources which
-    # must survive the upgrade.  The upgrade is performed in two steps, even though this
-    # is an all-in-one test, as this is close to how a real deployment with computes would
-    # be upgraded.
-    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-sanity --skip-sanitytest-cleanup
-    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-upgrade
-    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-sanity --skip-sanitytest-create --skip-sanitytest-cleanup
-    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-upgrade-converge
-    $TRIPLEO_ROOT/tripleo-ci/scripts/tripleo.sh --overcloud-sanity --skip-sanitytest-create
-fi
diff --git a/toci_gate_test.sh b/toci_gate_test.sh
index 6a4b4b3ad..d607d9564 100755
--- a/toci_gate_test.sh
+++ b/toci_gate_test.sh
@@ -199,7 +199,6 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
             fi
             if [[ $TOCI_JOBTYPE =~ 'multinode-upgrades' ]] ; then
                 OVERCLOUD_MAJOR_UPGRADE=1
-                RUN_PING_TEST=0
                 UNDERCLOUD_SSL=0
                 export UNDERCLOUD_SANITY_CHECK=0
                 if [[ $TOCI_JOBTYPE == 'multinode-upgrades' ]] ; then