From f4c40bb33cede9030bd6f56273922d8d49096026 Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Mon, 30 Sep 2024 10:42:53 -0700 Subject: [PATCH] Fix editorconfig format --- ci/update_distros.sh | 10 ++++---- distros_supported.yml | 51 ++++++++++++++++++------------------- spec/commons_spec.sh | 54 ++++++++++++++++++++-------------------- spec/run_kaction_spec.sh | 22 ++++++++-------- spec/undercloud_spec.sh | 30 +++++++++++----------- 5 files changed, 84 insertions(+), 83 deletions(-) diff --git a/ci/update_distros.sh b/ci/update_distros.sh index a245a4673..ad004bcc8 100755 --- a/ci/update_distros.sh +++ b/ci/update_distros.sh @@ -63,11 +63,11 @@ function _vagrant_pull { fi cat <>.distros_supported.yml $alias: - name: $name - vb_controller: $vb_controller - version: "$version" - project_id: $project_id - family: $family + name: $name + vb_controller: $vb_controller + version: "$version" + project_id: $project_id + family: $family EOT } diff --git a/distros_supported.yml b/distros_supported.yml index 4c92e8582..d280c53f1 100644 --- a/distros_supported.yml +++ b/distros_supported.yml @@ -7,33 +7,34 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## + rocky_9: - name: rockylinux/9 - vb_controller: IDE Controller - version: "3.0.0" - project_id: rocky-linux-cloud - family: rocky-linux-9 + name: rockylinux/9 + vb_controller: IDE Controller + version: "4.0.0" + project_id: rocky-linux-cloud + family: rocky-linux-9 centos_8: - name: centos/stream8 - vb_controller: IDE - version: "20210210.0" - project_id: centos-cloud - family: centos-stream-8 + name: centos/stream8 + vb_controller: IDE + version: "20210210.0" + project_id: centos-cloud + family: centos-stream-8 ubuntu_20: - name: generic/ubuntu2004 - vb_controller: IDE Controller - version: "4.3.12" - project_id: ubuntu-os-cloud - family: ubuntu-2004-lts + name: generic/ubuntu2004 + vb_controller: IDE Controller + version: "4.3.12" + project_id: ubuntu-os-cloud + family: ubuntu-2004-lts ubuntu_22: - name: generic/ubuntu2204 - vb_controller: IDE Controller - version: "4.3.12" - project_id: ubuntu-os-cloud - family: ubuntu-2204-lts + name: generic/ubuntu2204 + vb_controller: IDE Controller + version: "4.3.12" + project_id: ubuntu-os-cloud + family: ubuntu-2204-lts debian_11: - name: debian/bullseye64 - vb_controller: SATA Controller - version: "11.20240212.1" - project_id: debian-cloud - family: debian-11 + name: debian/bullseye64 + vb_controller: SATA Controller + version: "11.20240905.1" + project_id: debian-cloud + family: debian-11 diff --git a/spec/commons_spec.sh b/spec/commons_spec.sh index 5d9918747..969fc6a2a 100755 --- a/spec/commons_spec.sh +++ b/spec/commons_spec.sh @@ -9,33 +9,33 @@ ############################################################################## Describe 'commons.sh' - Include commons.sh + Include commons.sh - Describe 'vercmp()' - Parameters - '1.1.1' '==' '1.1.1' success - '1.1.1' '==' '1.1.0' failure - '1.1.0' '<' '1.1.1' success - '1.1.1' '<' '1.1.0' failure - '1.1.1' '<' '1.1.1' failure - '1.1.1' '<=' '1.1.1' success - '1.1.0' '<=' '1.1.1' success - '1.1.1' '<=' '1.1.0' failure - '1.1.1' '>' '1.1.0' success - '1.1.0' '>' '1.1.1' failure - '1.1.1' '>' '1.1.1' failure - '1.1.1' '>=' '1.1.0' success - '1.1.1' '>=' '1.1.1' success - '1.1.0' '>=' '1.1.1' failure + Describe 'vercmp()' + Parameters + '1.1.1' '==' '1.1.1' success + '1.1.1' '==' '1.1.0' failure + '1.1.0' '<' '1.1.1' success + '1.1.1' '<' '1.1.0' failure + '1.1.1' '<' '1.1.1' failure + '1.1.1' '<=' '1.1.1' success + '1.1.0' '<=' '1.1.1' success + '1.1.1' '<=' '1.1.0' failure + '1.1.1' '>' '1.1.0' success + '1.1.0' '>' '1.1.1' failure + '1.1.1' '>' '1.1.1' failure + '1.1.1' '>=' '1.1.0' success + '1.1.1' '>=' '1.1.1' success + '1.1.0' '>=' '1.1.1' failure + End + It 'performs comparation' + When call vercmp "$1" "$2" "$3" + The status should be "$4" + End + It 'raises error when specified an invalid operator' + When run vercmp '1.0.0' '!=' '2.0.0' + The stdout should equal "unrecognised op: !=" + The status should be failure + End End - It 'performs comparation' - When call vercmp "$1" "$2" "$3" - The status should be "$4" - End - It 'raises error when specified an invalid operator' - When run vercmp '1.0.0' '!=' '2.0.0' - The stdout should equal "unrecognised op: !=" - The status should be failure - End - End End diff --git a/spec/run_kaction_spec.sh b/spec/run_kaction_spec.sh index 645c74e1b..b30637237 100755 --- a/spec/run_kaction_spec.sh +++ b/spec/run_kaction_spec.sh @@ -9,17 +9,17 @@ ############################################################################## Describe 'run_kaction.sh' - Include run_kaction.sh + Include run_kaction.sh - Describe '_get_kolla_ansible_cmd()' - Parameters - 'deploy' 'kolla-ansible deploy --inventory ./samples/aio/hosts.ini' - 'destroy' 'kolla-ansible destroy --inventory ./samples/aio/hosts.ini --yes-i-really-really-mean-it' + Describe '_get_kolla_ansible_cmd()' + Parameters + 'deploy' 'kolla-ansible deploy --inventory ./samples/aio/hosts.ini' + 'destroy' 'kolla-ansible destroy --inventory ./samples/aio/hosts.ini --yes-i-really-really-mean-it' + End + It 'gets kolla-ansible action' + When call _get_kolla_ansible_cmd "$1" + The output should eq "$2" + The status should be success + End End - It 'gets kolla-ansible action' - When call _get_kolla_ansible_cmd "$1" - The output should eq "$2" - The status should be success - End - End End diff --git a/spec/undercloud_spec.sh b/spec/undercloud_spec.sh index b17c43bdd..90e1b1094 100755 --- a/spec/undercloud_spec.sh +++ b/spec/undercloud_spec.sh @@ -9,21 +9,21 @@ ############################################################################## Describe 'undercloud.sh' - Include undercloud.sh + Include undercloud.sh - Describe '_get_kolla_actions()' - Parameters - '13.7.0' 'minimal' 'bootstrap-servers deploy post-deploy' - '13.7.0' 'complete' 'bootstrap-servers prechecks pull deploy check post-deploy' - '14.7.0' 'minimal' 'install-deps bootstrap-servers deploy post-deploy' - '14.7.0' 'complete' 'install-deps bootstrap-servers prechecks pull deploy check post-deploy' - '15.0.0' 'minimal' 'install-deps bootstrap-servers deploy post-deploy' - '15.0.0' 'complete' 'install-deps bootstrap-servers prechecks pull deploy post-deploy' + Describe '_get_kolla_actions()' + Parameters + '13.7.0' 'minimal' 'bootstrap-servers deploy post-deploy' + '13.7.0' 'complete' 'bootstrap-servers prechecks pull deploy check post-deploy' + '14.7.0' 'minimal' 'install-deps bootstrap-servers deploy post-deploy' + '14.7.0' 'complete' 'install-deps bootstrap-servers prechecks pull deploy check post-deploy' + '15.0.0' 'minimal' 'install-deps bootstrap-servers deploy post-deploy' + '15.0.0' 'complete' 'install-deps bootstrap-servers prechecks pull deploy post-deploy' + End + It 'gets kolla actions to perform' + When call _get_kolla_actions "$1" "$2" + The output should eq "$3" + The status should be success + End End - It 'gets kolla actions to perform' - When call _get_kolla_actions "$1" "$2" - The output should eq "$3" - The status should be success - End - End End