Skip to content

Add repo fixup and proper CFEngine version for centos-6 build host #1778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
craigcomstock merged 3 commits into from
Jun 24, 2025
Merged

Add repo fixup and proper CFEngine version for centos-6 build host #1778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adae2e1
Added centos-6 case gto ci/distribution-patched.sh script
craigcomstock Jun 24, 2025
821e70e
Fixed sdk install script for older versions of sha256sum
craigcomstock Jun 24, 2025
637156c
Added case for centos-6 in build host setup script
craigcomstock Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ci/distribution-patched.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@ if grep CODENAME=stretch /etc/os-release; then
echo "deb http://archive.debian.org/debian-archive/debian stretch main" >/etc/apt/sources.list
echo "deb http://archive.debian.org/debian-archive/debian stretch-backports main" >>/etc/apt/sources.list
fi
if grep "CentOS Linux 7" /etc/os-release; then
sed -i 's/mirror.centos.org/vault.centos.org/;/^mirrorlist/d;s/^#baseurl/baseurl/' /etc/yum.repos.d/CentOS-Base.repo
fi
if [ -f /etc/centos-release ]; then
_version=$(cat /etc/centos-release | cut -d' ' -f3 | cut -d. -f1)
if [ "$_version" = "6" ] || [ "$_version" = "7" ]; then
sed -i 's/mirror.centos.org/vault.centos.org/;/^mirrorlist/d;s/^#baseurl/baseurl/' /etc/yum.repos.d/CentOS-Base.repo
fi
fi
if command -v yum; then
yum -e 0 -d 0 -y update
yum -e 0 -d 0 -y install git rsync
Expand Down
2 changes: 1 addition & 1 deletion ci/linux-install-jdk21.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ install_jdk() {
sha=267b10b14b4e5fada19aca3be3b961ce4f81f1bd3ffcd070e90a5586106125eb
fi
wget --quiet "$baseurl$tarball"
echo "$sha" "$tarball" | sha256sum --check -
echo "$sha $tarball" | sha256sum --check -
tar xf "$tarball"
tee /etc/profile.d/jdk.sh << EOF
export JAVA_HOME="/opt/jdk-$version"
Expand Down
55 changes: 31 additions & 24 deletions ci/setup-cfengine-build-host.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,33 +3,40 @@ shopt -s expand_aliases

# Use the newest CFEngine version we can
CFE_VERSION=3.26.0
source /etc/os-release
if [ "$ID" = "debian" ]; then
if [ "$VERSION_ID" -lt "9" ]; then
echo "Platform $ID $VERSION_ID is too old."
exit 9
fi
if [ "$VERSION_ID" -lt "11" ]; then
CFE_VERSION=3.21.7
fi
fi
if [ "$ID" = "redhat" ] || [ "$ID" = "centos" ]; then
if [ "$VERSION_ID" -lt "6" ]; then
echo "Platform $ID $VERSION_ID is too old."
exit 9
fi
if [ "$VERSION_ID" -lt "7" ]; then
if [ -f /etc/centos-release ]; then
_version=$(cat /etc/centos-release | cut -d' ' -f3 | cut -d. -f1)
if [ "$_version" = "6" ]; then
CFE_VERSION=3.24.2
fi
fi
if [ "$ID" = "ubuntu" ]; then
_version=$(echo $VERSION_ID | cut -d. -f1)
if [ "$_version" -lt "16" ]; then
echo "Platform $ID $VERSION_ID is too old."
exit 9
elif [ -f /etc/os-release ]; then
source /etc/os-release
if [ "$ID" = "debian" ]; then
if [ "$VERSION_ID" -lt "9" ]; then
echo "Platform $ID $VERSION_ID is too old."
exit 9
fi
if [ "$VERSION_ID" -lt "11" ]; then
CFE_VERSION=3.21.7
fi
fi
if [ "$ID" = "redhat" ] || [ "$ID" = "centos" ]; then
if [ "$VERSION_ID" -lt "6" ]; then
echo "Platform $ID $VERSION_ID is too old."
exit 9
fi
if [ "$VERSION_ID" -lt "7" ]; then
CFE_VERSION=3.24.2
fi
fi
if [ "$_version" -lt "20" ]; then
CFE_VERSION=3.21.7
if [ "$ID" = "ubuntu" ]; then
_version=$(echo $VERSION_ID | cut -d. -f1)
if [ "$_version" -lt "16" ]; then
echo "Platform $ID $VERSION_ID is too old."
exit 9
fi
if [ "$_version" -lt "20" ]; then
CFE_VERSION=3.21.7
fi
fi
fi

Expand Down
Loading