From 4e6154027133f20dce4d300fc6701848000e9c3b Mon Sep 17 00:00:00 2001 From: Ben Nemec Date: Tue, 30 Aug 2016 17:00:48 +0000 Subject: [PATCH] Remove Ceph from the ha job Now that we've re-enabled the nonha job we're testing ceph there, so we can remove it from the ha job and reduce the number of nodes needed by one. This should also speed up the ha job. Also, at the moment we aren't testing the non-ceph path at all in our check jobs which is not good either. Also switches the nonha job to use storage-environment.yaml so we keep coverage of that file. It turns out there's no practical difference between that and puppet-ceph-devel now because the composable work removed the deployment of osds on controllers. Change-Id: I67a4a6f9348e181204d5ee5afe377b8e65066dc1 --- toci_gate_test.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toci_gate_test.sh b/toci_gate_test.sh index cc4256611..1bde0819a 100755 --- a/toci_gate_test.sh +++ b/toci_gate_test.sh @@ -132,11 +132,11 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do fi ;; ha) - NODECOUNT=5 + NODECOUNT=4 # In ci our overcloud nodes don't have access to an external netwrok # --ntp-server is here to make the deploy command happy, the ci env # is on virt so the clocks should be in sync without it. - OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ceph-storage-scale 1 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml" + OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS --control-scale 3 --ntp-server 0.centos.pool.ntp.org -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-pacemaker.yaml -e /usr/share/openstack-tripleo-heat-templates/environments/network-isolation.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/network-templates/network-environment.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/net-iso.yaml" NETISO_V4=1 PACEMAKER=1 ;; @@ -148,7 +148,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do ENDPOINT_LIST_LOCATION=/usr/share/openstack-tripleo-heat-templates/environments CA_ENVIRONMENT_FILE=inject-trust-anchor-hiera.yaml fi - OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable-tls.yaml -e $ENDPOINT_LIST_LOCATION/tls-endpoints-public-ip.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/$CA_ENVIRONMENT_FILE --ceph-storage-scale 1 -e /usr/share/openstack-tripleo-heat-templates/environments/puppet-ceph-devel.yaml" + OVERCLOUD_DEPLOY_ARGS="$OVERCLOUD_DEPLOY_ARGS -e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable-tls.yaml -e $ENDPOINT_LIST_LOCATION/tls-endpoints-public-ip.yaml -e $TRIPLEO_ROOT/tripleo-ci/test-environments/$CA_ENVIRONMENT_FILE --ceph-storage-scale 1 -e /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" INTROSPECT=1 NODECOUNT=3 UNDERCLOUD_SSL=1