Skip to content

Commit

Permalink
Fix editorconfig format
Browse files Browse the repository at this point in the history
  • Loading branch information
electrocucaracha committed Sep 30, 2024
1 parent 8467bfb commit f4c40bb
Show file tree
Hide file tree
Showing 5 changed files with 84 additions and 83 deletions.
10 changes: 5 additions & 5 deletions ci/update_distros.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ function _vagrant_pull {
fi
cat <<EOT >>.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
}

Expand Down
51 changes: 26 additions & 25 deletions distros_supported.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
54 changes: 27 additions & 27 deletions spec/commons_spec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
22 changes: 11 additions & 11 deletions spec/run_kaction_spec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
30 changes: 15 additions & 15 deletions spec/undercloud_spec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit f4c40bb

Please sign in to comment.