File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change 5555 - debian:10
5656 - debian:11
5757 - debian:12
58- - registry.suse.com/suse/sle15:15
58+ # Need to pull in the repo GPG keys for sles
59+ # - registry.suse.com/suse/sle15:15.6
5960 needs : shellcheck
6061 runs-on : ubuntu-latest
6162 container : ${{ matrix.image }}
99100 PT_yum_source : " https://yum.overlookinfratech.com"
100101 run : ./tasks/install_linux.sh
101102 - name : Verify openvox-agent is installed
102- run : |-
103- [[ "$(/opt/puppetlabs/bin/puppet --version)" =~ [0-9]+\.[0-9]+\.[0-9]+ ]]
103+ run : /opt/puppetlabs/bin/puppet --version | grep -E '[0-9]+\.[0-9]+'
Original file line number Diff line number Diff line change @@ -71,7 +71,7 @@ set_repository() {
7171 local _family=" $1 "
7272
7373 case $_family in
74- amazon|fedora|rhel |sles)
74+ amazon|fedora|el |sles)
7575 repository=$yum_source
7676 ;;
7777 debian|ubuntu)
@@ -88,7 +88,7 @@ set_package_type() {
8888 local _family=" $1 "
8989
9090 case $_family in
91- amazon|fedora|rhel |sles)
91+ amazon|fedora|el |sles)
9292 package_type=' rpm'
9393 package_file_suffix=' noarch.rpm'
9494 ;;
@@ -112,7 +112,7 @@ set_collection_url() {
112112 family=' amazon'
113113 ;;
114114 RHEL|RedHat|CentOS|Scientific|OracleLinux|Rocky|AlmaLinux)
115- family=' rhel '
115+ family=' el '
116116 ;;
117117 Fedora)
118118 family=' fedora'
@@ -136,7 +136,9 @@ set_collection_url() {
136136 set_package_type $family
137137
138138 if [ " ${package_type} " == ' rpm' ]; then
139- package_name=" ${collection} -release-${family} -${full_version} .${package_file_suffix} "
139+ major_version=${full_version%% .* }
140+ assigned ' major_version'
141+ package_name=" ${collection} -release-${family} -${major_version} .${package_file_suffix} "
140142 else
141143 package_name=" ${collection} -release-${family}${full_version} .${package_file_suffix} "
142144 fi
You can’t perform that action at this time.
0 commit comments