From 6e30581a7255ca13e27cd8d87cb09fc1b6fdfd31 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Thu, 3 May 2018 11:35:30 +0200 Subject: [PATCH] Don't run full update/upgrade converge in CI to keep sane wall time We discovered we need to put back stack updates into the converge operations. This increases the run time of the upgrade procedure considerably, and e.g. our voting CI job for updates might go over the time limit. We'll need to start passing --update-plan-only to the converge operation to keep CI on previous run times. Change-Id: Idc5dbebc116aba2420d275aab3981186511f298e Related-Bug: #1768586 --- config/general_config/featureset036.yml | 2 ++ config/general_config/featureset037.yml | 2 ++ config/general_config/featureset040.yml | 2 ++ config/general_config/featureset051.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/config/general_config/featureset036.yml b/config/general_config/featureset036.yml index 06a83a4cd..acfc7c277 100644 --- a/config/general_config/featureset036.yml +++ b/config/general_config/featureset036.yml @@ -41,6 +41,8 @@ mixed_upgrade: true use_tripleo_upgrade: true ffu_overcloud_upgrade: true tripleo_upgrade_validations_non_fatal: true +# Reduce CI wall time +tripleo_upgrade_converge_plan_only: true # disable tripleo-upgrade container manipulation. create_docker_registry: false diff --git a/config/general_config/featureset037.yml b/config/general_config/featureset037.yml index 64993c239..1307148f8 100644 --- a/config/general_config/featureset037.yml +++ b/config/general_config/featureset037.yml @@ -7,6 +7,8 @@ composable_scenario: scenario000-multinode-containers.yaml overcloud_update: true tripleo_upgrade_validations_non_fatal: true tripleo_upgrade_debug: true +# Reduce CI wall time +tripleo_upgrade_converge_plan_only: true tripleo_ci: true use_oooq: true overcloud_ssh_user: "tripleo-admin" diff --git a/config/general_config/featureset040.yml b/config/general_config/featureset040.yml index 2ed6db961..ae3f96dfa 100644 --- a/config/general_config/featureset040.yml +++ b/config/general_config/featureset040.yml @@ -50,6 +50,8 @@ overcloud_ssh_user: "tripleo-admin" # Mandatory for deployed_servers tripleo_upgrade_validations_non_fatal: true +# Reduce CI wall time +tripleo_upgrade_converge_plan_only: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true diff --git a/config/general_config/featureset051.yml b/config/general_config/featureset051.yml index 12267c403..9d2ac64ca 100644 --- a/config/general_config/featureset051.yml +++ b/config/general_config/featureset051.yml @@ -51,6 +51,8 @@ overcloud_ssh_user: "tripleo-admin" # Mandatory for deployed_servers tripleo_upgrade_validations_non_fatal: true +# Reduce CI wall time +tripleo_upgrade_converge_plan_only: true # options below direct automatic doc generation by tripleo-collect-logs artcl_gen_docs: true