From a52bbde43fc5b7d43a8c9e3785efc64b26530682 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 27 Jan 2017 14:46:38 -0500 Subject: [PATCH] remove test-environments/multinode_major_upgrade.yaml This is now in t-h-t so we should only use that version. Note this means we use the master version of the env for defining the service list for the deployed (newton) overcloud. Change-Id: Ia7cc49daf8e9e26e3dee9db6f1bdb53b543b658e --- scripts/common_functions.sh | 2 +- scripts/deploy.sh | 6 +++ .../multinode_major_upgrade.yaml | 46 ------------------- toci_gate_test.sh | 13 ++---- 4 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 test-environments/multinode_major_upgrade.yaml diff --git a/scripts/common_functions.sh b/scripts/common_functions.sh index 134556d54..166345c48 100755 --- a/scripts/common_functions.sh +++ b/scripts/common_functions.sh @@ -335,7 +335,7 @@ function layer_ci_repo { function echo_vars_to_deploy_env { CALLER=$(caller) echo "# Written via echo_vars_to_deploy_env from $CALLER" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env - for VAR in CENTOS_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL UNDERCLOUD_HEAT_CONVERGENCE RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS PREDICTABLE_PLACEMENT OPSTOOLS_REPO_ENABLED; do + for VAR in CENTOS_MIRROR http_proxy INTROSPECT MY_IP no_proxy NODECOUNT OVERCLOUD_DEPLOY_ARGS OVERCLOUD_UPDATE_ARGS PACEMAKER SSH_OPTIONS STABLE_RELEASE TRIPLEO_ROOT TRIPLEO_SH_ARGS NETISO_V4 NETISO_V6 TOCI_JOBTYPE UNDERCLOUD_SSL UNDERCLOUD_HEAT_CONVERGENCE RUN_TEMPEST_TESTS RUN_PING_TEST JOB_NAME OVB UNDERCLOUD_IDEMPOTENT MULTINODE CONTROLLER_HOSTS COMPUTE_HOSTS SUBNODES_SSH_KEY TEST_OVERCLOUD_DELETE OVERCLOUD OSINFRA UNDERCLOUD_SANITY_CHECK OVERCLOUD_PINGTEST_ARGS FEATURE_BRANCH OVERCLOUD_ROLES UPGRADE_RELEASE OVERCLOUD_MAJOR_UPGRADE MAJOR_UPGRADE UNDERCLOUD_MAJOR_UPGRADE CA_SERVER UNDERCLOUD_TELEMETRY UNDERCLOUD_UI UNDERCLOUD_VALIDATIONS PREDICTABLE_PLACEMENT OPSTOOLS_REPO_ENABLED UPGRADE_ENV; do echo "export $VAR=\"${!VAR}\"" >> $TRIPLEO_ROOT/tripleo-ci/deploy.env done for role in $OVERCLOUD_ROLES; do diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 066daa4a4..3805dc5c0 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -307,6 +307,9 @@ if [ "$MULTINODE" = "1" ]; then CURRENT_OVERCLOUD_DEPLOY_ARGS=$OVERCLOUD_DEPLOY_ARGS # Set deploy args for newton deployment: export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --templates $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates -e $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/environments/deployed-server-environment.yaml -e $TRIPLEO_ROOT/$UPGRADE_RELEASE/usr/share/openstack-tripleo-heat-templates/environments/services/sahara.yaml" + if [ ! -z $UPGRADE_ENV ]; then + export OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/$UPGRADE_RELEASE/$UPGRADE_ENV" + fi echo_vars_to_deploy_env $TRIPLEO_ROOT/$UPGRADE_RELEASE/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.log & else @@ -444,6 +447,9 @@ if [ "$OVERCLOUD_MAJOR_UPGRADE" == 1 ] ; then # update-from-deployed-server-newton.yaml environment when upgrading from # newton. 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-newton.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 & diff --git a/test-environments/multinode_major_upgrade.yaml b/test-environments/multinode_major_upgrade.yaml deleted file mode 100644 index 7de1594ff..000000000 --- a/test-environments/multinode_major_upgrade.yaml +++ /dev/null @@ -1,46 +0,0 @@ -resource_registry: - OS::TripleO::Controller::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml - OS::TripleO::Compute::Net::SoftwareConfig: ../heat-templates/net-config-multinode.yaml - OS::TripleO::Services::Core: multinode-core.yaml - -parameter_defaults: - ControllerServices: - - OS::TripleO::Services::CACerts - - OS::TripleO::Services::Core - - OS::TripleO::Services::Kernel - - OS::TripleO::Services::Keystone - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::GlanceRegistry - - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::NeutronL3Agent - - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronServer - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::CinderVolume - - OS::TripleO::Services::HeatApi - - OS::TripleO::Services::HeatApiCfn - - OS::TripleO::Services::HeatApiCloudwatch - - OS::TripleO::Services::HeatEngine - - OS::TripleO::Services::SwiftProxy - - OS::TripleO::Services::SwiftStorage - - OS::TripleO::Services::SwiftRingBuilder - - OS::TripleO::Services::SaharaApi - - OS::TripleO::Services::SaharaEngine - - OS::TripleO::Services::MySQL - - OS::TripleO::Services::RabbitMQ - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::Memcached - - OS::TripleO::Services::Ntp - - OS::TripleO::Services::Timezone - - OS::TripleO::Services::TripleoPackages - - OS::TripleO::Services::TripleoFirewall - ControllerExtraConfig: - nova::compute::libvirt::services::libvirt_virt_type: qemu - nova::compute::libvirt::libvirt_virt_type: qemu - # Required for Centos 7.3 and Qemu 2.6.0 - nova::compute::libvirt::libvirt_cpu_mode: 'none' - SwiftCeilometerPipelineEnabled: False diff --git a/toci_gate_test.sh b/toci_gate_test.sh index 56ec72f71..b6708c5de 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -56,6 +56,7 @@ export UNDERCLOUD_MAJOR_UPGRADE=0 export OVERCLOUD_MAJOR_UPGRADE=0 export MAJOR_UPGRADE=0 export UPGRADE_RELEASE= +export UPGRADE_ENV= # Whether or not we deploy an Overcloud export OVERCLOUD=1 # NOTE(bnemec): At this time, the undercloud install + image build is taking from @@ -195,21 +196,13 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do UNDERCLOUD_MAJOR_UPGRADE=1 export UNDERCLOUD_SANITY_CHECK=1 fi - # TODO(emilien) remove this block when https://review.openstack.org/425690 is merged - # and packaged in RDO. 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 =~ scenario ]]; then - if [ -e /usr/share/openstack-tripleo-heat-templates/ci/environments/multinode_major_upgrade.yaml ]; then - UPGRADE_ENV=/usr/share/openstack-tripleo-heat-templates/ci/environments/multinode_major_upgrade.yaml - else - # For backward compatibility until https://review.openstack.org/425690 is merged & packaged. - UPGRADE_ENV=$TRIPLEO_ROOT/tripleo-ci/test-environments/multinode_major_upgrade.yaml - fi - OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $UPGRADE_ENV" + if [[ $TOCI_JOBTYPE == 'multinode-upgrades' ]] ; then + export UPGRADE_ENV=/usr/share/openstack-tripleo-heat-templates/ci/environments/multinode_major_upgrade.yaml fi OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --libvirt-type=qemu -t $OVERCLOUD_DEPLOY_TIMEOUT -r $TRIPLEO_ROOT/tripleo-ci/test-environments/upgrade_roles_data.yaml --overcloud-ssh-user $OVERCLOUD_SSH_USER --validation-errors-nonfatal" fi