Skip to content

Fixed up build host policy and build-environment-check for centos/redhat (3.21) #1537

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 7 commits into from
Nov 18, 2024
Merged

Fixed up build host policy and build-environment-check for centos/redhat (3.21) #1537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
29a50d3
Adjusted build host policy script to append all three runs to one pro…
craigcomstock Nov 14, 2024
7f4cc39
Adjusted build host policy a bit for centos_9
craigcomstock Nov 14, 2024
17d6dc1
Adjusted build-environment-check to align with centos-7, redhat-8 and…
craigcomstock Nov 14, 2024
c6c17df
Adjusted build host policy to disable debug packages only after rpm-b…
craigcomstock Nov 14, 2024
460d497
Fixed build-environment-check for centos/redhat rpm-build(-libs) pack…
craigcomstock Nov 17, 2024
cc9e4e4
Fix formatting in ci/cfengine-build-host-setup.cf
craigcomstock Nov 17, 2024
6fe4558
Fixed build host policy for centos-6 and rpm-build install
craigcomstock Nov 17, 2024
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
10 changes: 8 additions & 2 deletions build-scripts/build-environment-check
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

case "$OS" in
rhel|centos)
DEP_LIST="gcc-c++ ncurses ncurses-devel pkgconfig rpm-build pam-devel"
DEP_LIST="gcc-c++ ncurses ncurses-devel pkgconfig pam-devel"
UNWANTED_DEPS="libtool-ltdl libtool-ltdl-devel"
;;
debian|ubuntu)
Expand All @@ -32,10 +32,16 @@ case "$OS" in
;;
esac


# Fakeroot is here: http://dl.atrpms.net/el5-$1/atrpms/stable/fakeroot-1.6.4-15.1.el5.$1.rpm
# It is needed by the debian buildslaves for their packaging scripts
case "$OS-$OS_VERSION" in
rhel-* | centos-* ) DEP_LIST="$DEP_LIST" ;;
rhel-6|centos-6)
DEP_LIST="$DEP_LIST rpm-build"
;;
rhel-* | centos-* )
DEP_LIST="$DEP_LIST rpm-build-libs"
;;
*) DEP_LIST="$DEP_LIST fakeroot" ;;
esac

Expand Down
23 changes: 13 additions & 10 deletions ci/cfengine-build-host-setup.cf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ bundle agent cfengine_build_host_setup
"shellcheck" comment => "not sure why only ubuntu-20 needed this.";
debian.(!debian_12.!ubuntu_22)::
"python" comment => "debian-12 has only python3";
!(debian_9|ubuntu_16).(debian|ubuntu)::
"default-jre" comment => "on debian10+ and ubuntu18+ this will be jdk11, good enough for jenkins 2.426.1 https://www.jenkins.io/doc/book/platform-information/support-policy-java/index.html";
!(debian_9|ubuntu_16).(debian|ubuntu)::
"default-jre" comment => "on debian10+ and ubuntu18+ this will be jdk11, good enough for jenkins 2.426.1 https://www.jenkins.io/doc/book/platform-information/support-policy-java/index.html";

debian|ubuntu::
"libltdl7" package_policy => "delete";
Expand Down Expand Up @@ -61,7 +61,7 @@ bundle agent cfengine_build_host_setup
"pam-devel";
"rsync";
"make";
"rpm-build";
"libtool-ltdl" package_policy => "delete";

(redhat|centos).(yum_dnf_conf_ok)::
"expat-devel";
Expand All @@ -72,7 +72,13 @@ bundle agent cfengine_build_host_setup
"perl-Module-Load-Conditional";
"wget";

!(redhat_6|centos_6).(yum_dnf_conf_ok)::
"rpm-build-libs" handle => "rpm_build_installed";
"python3-psycopg2";

(redhat_6|centos_6).(yum_dnf_conf_ok)::
"rpm-build" handle => "rpm_build_installed";
"python-psycopg2" comment => "centos-6 provides python2 and psycopg2 for python2 as a package";
"perl-IO-Compress-Zlib" comment => "provides perl(IO::Uncompress::Gunzip) needed by lcov dependency package";
"perl-JSON";
# perl-Digest-MD5 and perl-Data-Dumper are included in perl for centos-6
Expand All @@ -87,7 +93,7 @@ bundle agent cfengine_build_host_setup

(redhat_6|centos_6).(yum_dnf_conf_ok)::
"python-psycopg2" comment => "centos-6 provides python2 and psycopg2 for python2 as a package";
(redhat_7|centos_7).(yum_dnf_conf_ok)::
!(redhat_6|centos_6).(yum_dnf_conf_ok)::
"python3-psycopg2";

# note that shellcheck, fakeroot and ccache require epel-release to be installed
Expand Down Expand Up @@ -232,12 +238,9 @@ bundle agent cfengine_build_host_setup
comment => "even though rhel8/9 come with /bin/perl perl >= 5.8.8 is needed by cfbuild-lcov-1.16-1.noarch. So the package must be installed.";
redhat_9.!have_python3_pip_package_installed.(yum_dnf_conf_ok)::
"yum install -y python3-pip" contain => in_shell;
redhat_8|centos_8|redhat_9::
"sudo sed -ri 's/^%_enable_debug_packages/#\0/' /usr/lib/rpm/redhat/macros" contain => in_shell;
# todo, need 2.7pip psycopg2-binary for ubuntu-20 as well?
debian_11.!have_pip2::
"wget https://bootstrap.pypa.io/pip/2.7/get-pip.py -O get-pip.py && python2 get-pip.py && pip install psycopg2-binary"
contain => in_shell;
redhat_8|centos_8|redhat_9|centos_9::
"sudo sed -ri 's/^%_enable_debug_packages/#\0/' /usr/lib/rpm/redhat/macros" contain => in_shell,
depends_on => { "rpm_build_installed" };

ubuntu_16.!have_i386_architecture:: # mingw build host
"${paths.dpkg} --add-architecture i386";
Expand Down
4 changes: 2 additions & 2 deletions ci/setup-cfengine-build-host.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ policy="$(dirname "$0")"/cfengine-build-host-setup.cf
chmod 600 "$policy"
/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee promises.log
grep -i error: promises.log && exit 1
/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee promises.log
/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee -a promises.log
grep -i error: promises.log && exit 1
/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee promises.log
/var/cfengine/bin/cf-agent -KIf "$policy" -b cfengine_build_host_setup | tee -a promises.log
grep -i error: promises.log && exit 1

cleanup