Skip to content

Commit ac3440f

Browse files
Merge pull request #2094 from craigcomstock/ent-13483-suse15
Adjusted suse build host platform setup to use 3.24.3 CFEngine version
2 parents 9f8fd87 + 3ad26b6 commit ac3440f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

ci/setup-cfengine-build-host.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,12 @@ if grep 6.10 /etc/issue; then
127127
fi
128128

129129
if grep suse /etc/os-release; then
130+
urlget https://cfengine-package-repos.s3.amazonaws.com/pub/gpg.key
131+
rpm --import gpg.key
132+
130133
if grep -i version=\"12 /etc/os-release; then
131134
echo "SUSE-12 found, cf-remote cannot be installed here so download directly similar to CentOS-6."
132135
if [ ! -x /var/cfengine/bin/cf-agent ]; then
133-
urlget https://cfengine-package-repos.s3.amazonaws.com/pub/gpg.key
134-
rpm --import gpg.key
135136
rm -rf cfengine-nova*rpm
136137
urlget https://cfengine-package-repos.s3.amazonaws.com/enterprise/Enterprise-3.24.3/agent/agent_suse12_x86_64/cfengine-nova-3.24.3-1.suse12.x86_64.rpm
137138
zypper in -y cfengine-nova-3.24.3-1.suse12.x86_64.rpm
@@ -164,7 +165,7 @@ else
164165
fi
165166
export PATH=/usr/local/bin:$PATH # some pip/pipx use /usr/local/bin
166167

167-
$PIP uninstall cf-remote || true # just in case a previous is there and would cause the install to fail
168+
$PIP uninstall -y cf-remote || true # just in case a previous is there and would cause the install to fail
168169
$PIP install cf-remote || true # if this fails we will try to install from source
169170

170171
echo "Checking for pre-installed CFEngine (chicken/egg problem)"
@@ -173,6 +174,9 @@ if ! /var/cfengine/bin/cf-agent -V; then
173174
echo "No existing CFEngine install found, try cf-remote..."
174175
if [ -n "$DEBIAN_STRETCH" ]; then
175176
_VERSION="--version 3.21.8"
177+
elif grep suse /etc/os-release; then
178+
# here we must use 3.24.2 instead of 3.24.3 because 3.24.3 has libcurl 4 which depends on unavailable OPENSSL_3.2.0
179+
_VERSION="--version 3.24.2" # we removed suse platforms in 3.27.0
176180
else
177181
_VERSION=""
178182
fi

0 commit comments

Comments
 (0)