diff --git a/data/sles4sap/qe_sap_deployment/qesap_aws.yaml b/data/sles4sap/qe_sap_deployment/qesap_aws.yaml index 452d6ab0c7eb..d493037e08c3 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_aws.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_aws.yaml @@ -35,7 +35,8 @@ ansible: primary_site: 'goofy' secondary_site: 'miky' create: - - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address=testing@suse.com + - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml - sap-hana-storage.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_aws_fencing.yaml b/data/sles4sap/qe_sap_deployment/qesap_aws_fencing.yaml index f12dbd334942..dfd01886efd7 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_aws_fencing.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_aws_fencing.yaml @@ -38,7 +38,7 @@ ansible: primary_site: 'goofy' secondary_site: 'miky' create: - - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address=testing@suse.com + - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_aws_fullypatch.yaml b/data/sles4sap/qe_sap_deployment/qesap_aws_fullypatch.yaml deleted file mode 100644 index f37543f82e34..000000000000 --- a/data/sles4sap/qe_sap_deployment/qesap_aws_fullypatch.yaml +++ /dev/null @@ -1,49 +0,0 @@ -# SUSE's openQA tests -# -# Copyright SUSE LLC -# SPDX-License-Identifier: FSFAP -# Maintainer: QE-SAP -# Summary: Generic yaml template for use with qe-sap-deployment project: https://github.com/SUSE/qe-sap-deployment -provider: 'aws' -apiver: 3 -terraform: - variables: - aws_region: '%REGION%' - deployment_name: '%DEPLOYMENTNAME%' - os_image: '%OS_VER%' - os_owner: '%OS_OWNER%' - private_key: '%SSH_KEY_PRIV%' - public_key: '%SSH_KEY_PUB%' - aws_credentials: '/root/amazon_credentials' - hana_instancetype: '%HANA_INSTANCE_TYPE%' - hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' -ansible: - az_storage_account_name: '%HANA_ACCOUNT%' - az_container_name: '%HANA_CONTAINER%' - az_sas_token: '%HANA_TOKEN%' - hana_media: - - '%HANA_SAR%' - - '%HANA_CLIENT_SAR%' - - '%HANA_SAPCAR%' - hana_vars: - sap_hana_install_software_directory: /hana/shared/install - sap_hana_install_master_password: 'DoNotUseThisPassw0rd' - sap_hana_install_sid: 'HDB' - sap_hana_install_instance_number: '00' - sap_domain: 'qe-test.example.com' - primary_site: 'goofy' - secondary_site: 'miky' - create: - - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address=testing@suse.com - - fully-patch-system.yaml - - pre-cluster.yaml - - sap-hana-preconfigure.yaml - - sap-hana-storage.yaml - - sap-hana-download-media.yaml - - sap-hana-install.yaml - - sap-hana-system-replication.yaml - - sap-hana-system-replication-hooks.yaml - - sap-hana-cluster.yaml -e use_sbd=false - destroy: - - deregister.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_aws_sapconf.yaml b/data/sles4sap/qe_sap_deployment/qesap_aws_sapconf.yaml index 81246ff277ad..ff643a991672 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_aws_sapconf.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_aws_sapconf.yaml @@ -36,6 +36,7 @@ ansible: secondary_site: 'miky' create: - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml -e use_sapconf=true - sap-hana-storage.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure.yaml index d66b7c9636e2..557328c41fed 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_azure.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_azure.yaml @@ -34,6 +34,7 @@ ansible: secondary_site: 'miky' create: - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml -e use_reboottimeout=900 - cluster_sbd_prep.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_fullypatch.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_fullypatch.yaml deleted file mode 100644 index 557328c41fed..000000000000 --- a/data/sles4sap/qe_sap_deployment/qesap_azure_fullypatch.yaml +++ /dev/null @@ -1,48 +0,0 @@ -# SUSE's openQA tests -# -# Copyright SUSE LLC -# SPDX-License-Identifier: FSFAP -# Maintainer: QE-SAP -# Summary: Generic yaml template for use with qe-sap-deployment project: https://github.com/SUSE/qe-sap-deployment -provider: 'azure' -apiver: 3 -terraform: - variables: - az_region: '%REGION%' - deployment_name: '%DEPLOYMENTNAME%' - os_image: '%OS_VER%' - public_key: '%SSH_KEY_PUB%' - hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - vnet_address_range: '%VNET_ADDRESS_RANGE%' - subnet_address_range: '%SUBNET_ADDRESS_RANGE%' -ansible: - az_storage_account_name: '%HANA_ACCOUNT%' - az_container_name: '%HANA_CONTAINER%' - az_sas_token: '%HANA_TOKEN%' - hana_media: - - '%HANA_SAR%' - - '%HANA_CLIENT_SAR%' - - '%HANA_SAPCAR%' - hana_vars: - sap_hana_install_software_directory: /hana/shared/install - sap_hana_install_master_password: 'DoNotUseThisPassw0rd' - sap_hana_install_sid: 'HA0' - sap_hana_install_instance_number: '00' - sap_domain: 'qe-test.example.com' - primary_site: 'goofy' - secondary_site: 'miky' - create: - - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' - - fully-patch-system.yaml - - pre-cluster.yaml - - sap-hana-preconfigure.yaml -e use_reboottimeout=900 - - cluster_sbd_prep.yaml - - sap-hana-storage.yaml - - sap-hana-download-media.yaml - - sap-hana-install.yaml - - sap-hana-system-replication.yaml - - sap-hana-system-replication-hooks.yaml - - sap-hana-cluster.yaml - destroy: - - deregister.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_roles.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_roles.yaml index 72395ea3b607..a6394d225745 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_azure_roles.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_azure_roles.yaml @@ -35,6 +35,7 @@ ansible: secondary_site: 'miky' create: - registration_role.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml -e use_reboottimeout=900 - cluster_sbd_prep.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf.yaml index d399f422f223..5b035df9438f 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf.yaml @@ -14,7 +14,6 @@ terraform: public_key: '%SSH_KEY_PUB%' hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - ansible: az_storage_account_name: '%HANA_ACCOUNT%' az_container_name: '%HANA_CONTAINER%' @@ -33,6 +32,7 @@ ansible: secondary_site: 'miky' create: - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml -e use_sapconf=true -e use_reboottimeout=900 - cluster_sbd_prep.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf_no_reg.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf_no_reg.yaml index 2127cdffa4cb..4c5619283599 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf_no_reg.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_azure_sapconf_no_reg.yaml @@ -14,7 +14,6 @@ terraform: public_key: '%SSH_KEY_PUB%' hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - ansible: az_storage_account_name: '%HANA_ACCOUNT%' az_container_name: '%HANA_CONTAINER%' @@ -32,6 +31,7 @@ ansible: primary_site: 'goofy' secondary_site: 'miky' create: + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml -e use_sapconf=true -e use_reboottimeout=900 - cluster_sbd_prep.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_azure_uri.yaml b/data/sles4sap/qe_sap_deployment/qesap_azure_uri.yaml index 61c3a4b35bf6..f67318d7c36f 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_azure_uri.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_azure_uri.yaml @@ -10,11 +10,10 @@ terraform: variables: az_region: '%REGION%' deployment_name: '%DEPLOYMENTNAME%' + os_image_uri: '%OS_URI%' public_key: '%SSH_KEY_PUB%' hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - os_image_uri: '%OS_URI%' - ansible: az_storage_account_name: '%HANA_ACCOUNT%' az_container_name: '%HANA_CONTAINER%' @@ -33,6 +32,7 @@ ansible: secondary_site: 'miky' create: - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml -e use_sapconf=%USE_SAPCONF% - cluster_sbd_prep.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_gcp.yaml b/data/sles4sap/qe_sap_deployment/qesap_gcp.yaml index 91698124ab85..7c223b3b93ee 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_gcp.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_gcp.yaml @@ -38,6 +38,7 @@ ansible: secondary_site: 'miky' create: - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml - sap-hana-storage.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_gcp_fullypatch.yaml b/data/sles4sap/qe_sap_deployment/qesap_gcp_fullypatch.yaml deleted file mode 100644 index ce830c84ef77..000000000000 --- a/data/sles4sap/qe_sap_deployment/qesap_gcp_fullypatch.yaml +++ /dev/null @@ -1,51 +0,0 @@ -# SUSE's openQA tests -# -# Copyright SUSE LLC -# SPDX-License-Identifier: FSFAP -# Maintainer: QE-SAP -# Summary: Generic yaml template for use with qe-sap-deployment project: https://github.com/SUSE/qe-sap-deployment -provider: 'gcp' -apiver: 3 -terraform: - variables: - project: 'ei-sle-qa-sap-8469' - region: '%REGION%' - deployment_name: '%DEPLOYMENTNAME%' - os_image: '%OS_VER%' - private_key: '%SSH_KEY_PRIV%' - public_key: '%SSH_KEY_PUB%' - gcp_credentials_file: '/root/google_credentials.json' - hana_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - iscsi_remote_python: '%ANSIBLE_REMOTE_PYTHON%' - hana_data_disk_type: '%HANA_DATA_DISK_TYPE%' - hana_log_disk_type: '%HANA_LOG_DISK_TYPE%' - -ansible: - az_storage_account_name: '%HANA_ACCOUNT%' - az_container_name: '%HANA_CONTAINER%' - az_sas_token: '%HANA_TOKEN%' - hana_media: - - '%HANA_SAR%' - - '%HANA_CLIENT_SAR%' - - '%HANA_SAPCAR%' - hana_vars: - sap_hana_install_software_directory: /hana/shared/install - sap_hana_install_master_password: 'DoNotUseThisPassw0rd' - sap_hana_install_sid: 'HDB' - sap_hana_install_instance_number: '00' - sap_domain: 'qe-test.example.com' - primary_site: 'goofy' - secondary_site: 'miky' - create: - - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' - - fully-patch-system.yaml - - pre-cluster.yaml - - sap-hana-preconfigure.yaml - - sap-hana-storage.yaml - - sap-hana-download-media.yaml - - sap-hana-install.yaml - - sap-hana-system-replication.yaml - - sap-hana-system-replication-hooks.yaml - - sap-hana-cluster.yaml -e use_sbd=false - destroy: - - deregister.yaml diff --git a/data/sles4sap/qe_sap_deployment/qesap_gcp_sapconf.yaml b/data/sles4sap/qe_sap_deployment/qesap_gcp_sapconf.yaml index 8dcd1349bc18..e65091fdcd3b 100644 --- a/data/sles4sap/qe_sap_deployment/qesap_gcp_sapconf.yaml +++ b/data/sles4sap/qe_sap_deployment/qesap_gcp_sapconf.yaml @@ -38,6 +38,7 @@ ansible: secondary_site: 'miky' create: - registration.yaml -e reg_code='%SCC_REGCODE_SLES4SAP%' -e email_address='testing@suse.com' + - fully-patch-system.yaml - pre-cluster.yaml - sap-hana-preconfigure.yaml -e use_sapconf=true - sap-hana-storage.yaml