openstack
/
tripleo-ci
Code Issues Proposed changes

Merge "Corrected release config location for log collection"

This commit is contained in:
Zuul 2018-10-21 16:14:41 +00:00 committed by Gerrit Code Review
parent 94738809b1 c25a428409
commit ab0f0ae95d
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/tripleo-ci/run-v3.yaml
View File

@ -102,6 +102,8 @@
{% else %}
export TOCI_JOBTYPE={{ environment_type }}-featureset{{ featureset }}
{% endif %}
export DISTRIBUTION={{ ansible_distribution }}
export DISTRIBUTION_MAJOR_VERSION={{ ansible_distribution_major_version }}
{% if nodes is defined %}
export NODES_FILE={{ nodes_file }}

2
playbooks/tripleo-ci/templates/oooq_common_functions.sh.j2
View File

@ -140,7 +140,7 @@ get_extra_vars_from_release()
{
local release_name=$1
local release_hash=$2
local release_file=$LOCAL_WORKING_DIR/config/release/tripleo-ci/$release_name.yml
local release_file=$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-${DISTRIBUTION_MAJOR_VERSION:-7}/$release_name.yml
echo "--extra-vars @$release_file -e dlrn_hash=$release_hash -e get_build_command=$release_hash"
}

6
playbooks/tripleo-ci/templates/toci_quickstart.sh.j2
View File

@ -43,10 +43,12 @@ QUICKSTART_INSTALL_CMD="
--tags {{ ','.join(tags) }}$EXTRA_TAGS
"
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml"
QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
$LOCAL_WORKING_DIR/playbooks/collect-logs.yml \
-vv \
--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml \
$QUICKSTART_DEFAULT_RELEASE_ARG \
{{ featureset_conf }} \
{{ env_vars }} \
{{ extra_vars }} \
@ -56,8 +58,6 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
--tags all \
"
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}/$QUICKSTART_RELEASE.yml"
declare -A RELEASE_ARGS=()
if [[ -f "$RELEASES_FILE_OUTPUT" ]]; then

2
scripts/oooq_common_functions.sh
View File

@ -158,6 +158,6 @@ get_extra_vars_from_release()
{
local release_name=$1
local release_hash=$2
local release_file=$LOCAL_WORKING_DIR/config/release/tripleo-ci/$release_name.yml
local release_file=$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-${DISTRIBUTION_MAJOR_VERSION:-7}/$release_name.yml
echo "--extra-vars @$release_file -e dlrn_hash=$release_hash -e get_build_command=$release_hash"
}

6
toci_quickstart.sh
View File

@ -44,10 +44,12 @@ QUICKSTART_INSTALL_CMD="
--tags $TAGS
"
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-${DISTRIBUTION_MAJOR_VERSION:-7}/$QUICKSTART_RELEASE.yml"
QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
$LOCAL_WORKING_DIR/playbooks/collect-logs.yml \
-vv \
--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml \
$QUICKSTART_DEFAULT_RELEASE_ARG \
$FEATURESET_CONF \
$ENV_VARS \
$EXTRA_VARS \
@ -57,8 +59,6 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
--tags all \
"
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/${DISTRIBUTION:-CentOS}-${DISTRIBUTION_MAJOR_VERSION:-7}/$QUICKSTART_RELEASE.yml"
declare -A RELEASE_ARGS=()
if [[ -f "$RELEASES_FILE_OUTPUT" ]]; then