Merge "Revert "Temporarily disable ceph in the updates job""
This commit is contained in:
commit
d5aeb65a22
|
@ -154,8 +154,7 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
case $JOB_TYPE_PART in
|
case $JOB_TYPE_PART in
|
||||||
updates)
|
updates)
|
||||||
if [[ "$TOCI_JOBTYPE" =~ 'ovb-updates' ]] ; then
|
if [[ "$TOCI_JOBTYPE" =~ 'ovb-updates' ]] ; then
|
||||||
NODECOUNT=2
|
NODECOUNT=3
|
||||||
# TODO(bnemec): Re-enable Ceph in the updates job
|
|
||||||
if [[ "${STABLE_RELEASE}" =~ ^mitaka$ ]] ; then
|
if [[ "${STABLE_RELEASE}" =~ ^mitaka$ ]] ; then
|
||||||
ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
|
ENDPOINT_LIST_LOCATION=$TRIPLEO_ROOT/tripleo-ci/test-environments
|
||||||
CA_ENVIRONMENT_FILE=inject-trust-anchor-ipv6.yaml
|
CA_ENVIRONMENT_FILE=inject-trust-anchor-ipv6.yaml
|
||||||
|
@ -172,6 +171,8 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
|
||||||
-e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable-tls-ipv6.yaml
|
-e $TRIPLEO_ROOT/tripleo-ci/test-environments/enable-tls-ipv6.yaml
|
||||||
-e $ENDPOINT_LIST_LOCATION/tls-endpoints-public-ip.yaml
|
-e $ENDPOINT_LIST_LOCATION/tls-endpoints-public-ip.yaml
|
||||||
-e $TRIPLEO_ROOT/tripleo-ci/test-environments/$CA_ENVIRONMENT_FILE
|
-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
|
||||||
"
|
"
|
||||||
OVERCLOUD_UPDATE_ARGS="-e /usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml $OVERCLOUD_DEPLOY_ARGS"
|
OVERCLOUD_UPDATE_ARGS="-e /usr/share/openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml $OVERCLOUD_DEPLOY_ARGS"
|
||||||
NETISO_V6=1
|
NETISO_V6=1
|
||||||
|
|
Loading…
Reference in New Issue