openstack
/
tripleo-ci
Code Issues Proposed changes

ensure tripleo-validations are turned off upstream 

Let's be explicit about ensuring these tasks are off

Closes-Bug: #1794034
Change-Id: I8b6f59f848cd0462eae8e1db8d4ad93a698815dc
This commit is contained in:
Wes Hayutin 2018-09-24 13:02:03 -06:00
parent f942829f0a
commit 156c2b1f9a
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ export DEFAULT_ARGS="--extra-vars local_working_dir=$LOCAL_WORKING_DIR \
--inventory $LOCAL_WORKING_DIR/hosts \
--extra-vars tripleo_root={{ tripleo_root }} \
--extra-vars working_dir=$WORKING_DIR \
--skip-tags "tripleo-validations,teardown-all" \
"
# --install-deps arguments installs deps and then quits, no other arguments are
@ -40,7 +41,6 @@ QUICKSTART_VENV_CMD="
QUICKSTART_INSTALL_CMD="
$LOCAL_WORKING_DIR/bin/ansible-playbook
--tags {{ ','.join(tags) }}$EXTRA_TAGS
--skip-tags teardown-all
"
QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
@ -54,7 +54,6 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
--extra-vars @{{ tripleo_root }}/tripleo-ci/toci-quickstart/config/collect-logs.yml \
--extra-vars artcl_collect_dir=$LOGS_DIR \
--tags all \
--skip-tags teardown-all \
"
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml"

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

@ -50,3 +50,7 @@ influxdb_password:
influxdb_dbname: tripleo_ci
influxdb_data_file_path: "{{ artcl_collect_dir }}/influxdb_data"
influxdb_create_data_file: true
run_tripleo_validations: false
run_tripleo_validations_negative_tests: false
run_tripleo_validations_setup: false

3
toci_quickstart.sh
View File

@ -19,6 +19,7 @@ export DEFAULT_ARGS="--extra-vars local_working_dir=$LOCAL_WORKING_DIR \
--inventory $LOCAL_WORKING_DIR/hosts \
--extra-vars tripleo_root=$TRIPLEO_ROOT \
--extra-vars working_dir=$WORKING_DIR \
--skip-tags "tripleo-validations,teardown-all" \
"
# --install-deps arguments installs deps and then quits, no other arguments are
@ -41,7 +42,6 @@ QUICKSTART_VENV_CMD="
QUICKSTART_INSTALL_CMD="
$LOCAL_WORKING_DIR/bin/ansible-playbook
--tags $TAGS
--skip-tags teardown-all
"
QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
@ -55,7 +55,6 @@ QUICKSTART_COLLECTLOGS_CMD="$LOCAL_WORKING_DIR/bin/ansible-playbook \
--extra-vars @$COLLECT_CONF \
--extra-vars artcl_collect_dir=$LOGS_DIR \
--tags all \
--skip-tags teardown-all \
"
export QUICKSTART_DEFAULT_RELEASE_ARG="--extra-vars @$LOCAL_WORKING_DIR/config/release/tripleo-ci/$QUICKSTART_RELEASE.yml"