From 5d1a7a8cf0ebdf2438c868836df0d09a63c262e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Barcarol=20Guimar=C3=A3es?= Date: Wed, 10 Oct 2018 15:15:44 +0000 Subject: [PATCH 1/2] Remove template from docs --- CONFIGURATION.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/CONFIGURATION.md b/CONFIGURATION.md index 6495b003..ffa947cc 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -71,8 +71,6 @@ tests: target_cloud: '' openshift_installer: target_cloud: '' - openshift_installer_smoke: - target_cloud: '' ``` # `tag_specification` @@ -322,10 +320,6 @@ and runs conformance tests. `openshift_installer` is a test that provisions a cluster using `openshift-installer` and runs conformance tests. -## `tests.openshift_installer_smoke` -`openshift_installer_smoke` is a test that provisions a cluster using -`openshift-installer` and runs smoke tests. - ## `tests.*.target_cloud` `target_cloud` can be either `aws` or `gcp` and specifies the cloud provider to use to provision the cluster for `openshift_ansible`, `openshift_ansible_src`, From 6c94c2c40fad5582a1bfd74e6f114a9546a6dc42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Barcarol=20Guimar=C3=A3es?= Date: Wed, 10 Oct 2018 08:19:51 +0000 Subject: [PATCH 2/2] Replace target cloud with cluster profile --- CONFIGURATION.md | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/CONFIGURATION.md b/CONFIGURATION.md index ffa947cc..dfa048ea 100644 --- a/CONFIGURATION.md +++ b/CONFIGURATION.md @@ -66,11 +66,11 @@ tests: container: from: '' openshift_ansible: - target_cloud: '' + cluster_profile: '' openshift_ansible_src: - target_cloud: '' + cluster_profile: '' openshift_installer: - target_cloud: '' + cluster_profile: '' ``` # `tag_specification` @@ -320,10 +320,20 @@ and runs conformance tests. `openshift_installer` is a test that provisions a cluster using `openshift-installer` and runs conformance tests. -## `tests.*.target_cloud` -`target_cloud` can be either `aws` or `gcp` and specifies the cloud provider to -use to provision the cluster for `openshift_ansible`, `openshift_ansible_src`, -`openshift_installer`, and `openshift_installer_smoke` tests. +## `tests.*.cluster_profile` +`cluster_profile` chooses the profile used as input to the installer. This +field is only valid in tests that provision a cluster (`openshift_ansible`, +`openshift_ansible_src`, and `openshift_installer`). Valid values are: + +- `aws` +- `aws-atomic` +- `aws-centos` +- `gcp` +- `gcp-ha` +- `gcp-crio` + +These are a subset of the profiles found in the +[`release` repository](https://github.com/openshift/release/tree/master/cluster/test-deploy). # `raw_steps` `raw_steps` is intended for advanced use of `ci-operator` to build custom execution