openstack
/
tripleo-ci
Code Issues Proposed changes

Streamline variables passed in different environments 

- OVB and multinode/singlemode jobs are passed different settings
files based on the location where the jobs run. This review
changes toci-gate-test to pass both the general and rdocloud
multinode setting files as is the case with OVB.

 - Removes the period job registry definitions.
These should be passed in release files only.

- Sets update_containers to run with
containerized_overcloud or containerized_undercloud

Closes-Bug: #1775874
Change-Id: I8f498073f1df9de70372f09b8c43e0d4adb5b42a
This commit is contained in:
Ronelle Landy 2018-06-08 15:18:43 -04:00 committed by Steve Baker
parent cf6b217b2e
commit 1edb87d068
4 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
toci-quickstart/config/testenv/multinode-rdocloud.yml
View File

@ -35,13 +35,12 @@ tempest_track_resources: false
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.3.5-x86_64-disk.img
# Container settings
# Use trunk.registry.rdoproject.org for periodic jobs only
docker_registry_host: "{% if lookup('env', 'PERIODIC')|default('0')|int != 1 %}docker.io{% else %}trunk.registry.rdoproject.org{% endif %}"
docker_registry_namespace: "tripleo{{ release }}"
# Container settings are set in release files
# Container update settings
update_containers: "{% if containerized_overcloud|bool %}true{% endif %}"
update_containers: >-
{% if containerized_overcloud|bool or containerized_undercloud|bool -%}
true
{%- endif -%}
# Tempestmail settings
tempestmail_log_server: http://logs.rdoproject.org

5
toci-quickstart/config/testenv/multinode.yml
View File

@ -33,7 +33,10 @@ tempest_track_resources: false
undercloud_undercloud_cleanup: false
# Container update settings
update_containers: "{% if containerized_overcloud|bool %}true{% endif %}"
update_containers: >-
{% if containerized_overcloud|bool or containerized_undercloud|bool -%}
true
{%- endif -%}
#build-test packages
artg_repos_dir: /home/zuul/src/git.openstack.org/openstack

14
toci-quickstart/config/testenv/ovb-rdocloud.yml
View File

@ -3,9 +3,6 @@
# These values are defined now in the te-broker config
# https://github.com/openstack-infra/tripleo-ci/blob/master/scripts/te-broker/create-env#L47
#bmc_flavor: ci.m1.small
#baremetal_flavor: ci.m1.xlarge
#undercloud_flavor: ci.m1.xlarge
custom_nameserver:
- 38.145.33.91
@ -21,16 +18,17 @@ workers_args: >-
-e {{ overcloud_templates_path }}/environments/debug.yaml
overcloud_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
ipa_image_url: http://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
# Container settings
# Use trunk.registry.rdoproject.org for periodic jobs only
docker_registry_host: "{% if lookup('env', 'PERIODIC')|default('0')|int != 1 %}docker.io{% else %}trunk.registry.rdoproject.org{% endif %}"
docker_registry_namespace: "tripleo{{ release }}"
# Container settings are set in release files
# Use cirros cached image
tempest_test_image_path: /opt/cache/files/cirros-0.3.5-x86_64-disk.img
# Container update settings
update_containers: "{% if containerized_overcloud|bool %}true{% endif %}"
update_containers: >-
{% if containerized_overcloud|bool or containerized_undercloud|bool -%}
true
{%- endif -%}
# We don't need to cleanup TripleO CI
tempest_track_resources: false

9
toci_gate_test-oooq.sh
View File

@ -179,10 +179,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-undercloud.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-update.yml multinode-overcloud-upgrade.yml multinode-validate.yml"}
fi
FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode-rdocloud.yml"
else
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
fi
UNDERCLOUD="127.0.0.2"
TAGS="build,undercloud-setup,undercloud-scripts,undercloud-install,undercloud-post-install,tripleo-validations,overcloud-scripts,overcloud-prep-config,overcloud-prep-containers,overcloud-deploy,overcloud-post-deploy,overcloud-validate"
@ -198,10 +197,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-undercloud.yml multinode-undercloud-upgrade.yml multinode-overcloud-prep.yml multinode-overcloud.yml multinode-overcloud-upgrade.yml multinode-validate.yml"}
fi
FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode-rdocloud.yml"
else
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
fi
TAGS="build,undercloud-setup,undercloud-scripts,undercloud-install,undercloud-validate,images"
;;
@ -210,10 +208,9 @@ for JOB_TYPE_PART in $(sed 's/-/ /g' <<< "${TOCI_JOBTYPE:-}") ; do
UNDERCLOUD="127.0.0.2"
export PLAYBOOKS=${PLAYBOOKS:-"quickstart.yml multinode-standalone.yml"}
FEATURESET_CONF=" --extra-vars @$LWD/config/general_config/featureset-multinode-common.yml $FEATURESET_CONF"
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
if [[ $NODEPOOL_PROVIDER == "rdo-cloud-tripleo" ]]; then
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode-rdocloud.yml"
else
ENV_VARS="$ENV_VARS --extra-vars @$TRIPLEO_ROOT/tripleo-ci/toci-quickstart/config/testenv/multinode.yml"
fi
TAGS="build,standalone"
;;