Adjusted several ci components to work well with containers

Ticket: ENT-13030
Changelog: none

Author: craigcomstock

ci/cfengine-build-host-setup.cf

@@ -155,6 +155,8 @@ bundle agent cfengine_build_host_setup
       "systemssl_build_host" expression => fileexists("/etc/cfengine-systemssl-build-host.flag");
       "bootstrap_pr_host" expression => fileexists("/etc/cfengine-bootstrap-pr-host.flag");
       "containers_host" expression => fileexists("/etc/cfengine-containers-host.flag");
+      "not_in_container" expression => not(fileexists("/etc/cfengine-in-container.flag")),
+        comment => "We use an explicit flag file that we control to avoid ambiguity about whether we are in a container or not.";
     linux::
       "have_coredumpctl" expression => returnszero("command -v coredumpctl", "useshell");
       "missing_opt_jdk21" expression => not(fileexists("/opt/jdk-21.0.1"));
@@ -180,7 +182,7 @@ bundle agent cfengine_build_host_setup
         comment => "note: centos-7 has installed instead of --installed argument, and that works on rhel-8 and rhel-9 so go with the sub-command instead of option";
 
   commands:
-    have_coredumpctl::
+    have_coredumpctl.not_in_container::
       "sysctl kernel.core_pattern='|/lib/systemd/systemd-coredump %p %u %g %s %t %e'" -> { "ENT-12669" }
         comment => "Ensure that core_pattern is proper for systemd-coredump if coredumpctl is present.",
         contain => in_shell;
@@ -207,7 +209,7 @@ bundle agent cfengine_build_host_setup
     ubuntu_16::
       "have_i386_architecture" expression => strcmp(execresult("${paths.dpkg} --print-foreign-architectures", "noshell"), "i386");
     ubuntu::
-      "have_localhost_localdomain_hostname" expression => strcmp(execresult("${paths.hostname} -f", "useshell"), "localhost.localdomain");
+      "localhost_localdomain_hostname_missing" expression => not(strcmp(execresult("${paths.hostname} -f", "useshell"), "localhost.localdomain"));
     opensuse|suse|sles::
       "have_$(suse_users_and_groups)_group" expression => returnszero("grep '^$(suse_users_and_groups):' /etc/group >/dev/null", "useshell");
       "have_$(suse_users_and_groups)_user" expression => returnszero("grep '^$(suse_users_and_groups):' /etc/passwd >/dev/null", "useshell");
@@ -278,7 +280,7 @@ jenkins_builds ALL=NOPASSWD: /usr/bin/podman
     mingw_build_host.!have_i386_architecture::
       "${paths.dpkg} --add-architecture i386";
 
-    ubuntu.!have_localhost_localdomain_hostname::
+    ubuntu.not_in_container.localhost_localdomain_hostname_missing::
       "/usr/bin/hostnamectl set-hostname localhost.localdomain"
         comment => "hack for aws ubuntu hosts having unique ip-n-n-n-n hostnames, we need localhost.localdomain";
     !have_daemon_group.(suse|sles|opensuse)::

ci/linux-install-jdk21.sh

@@ -1,29 +1,38 @@
 #!/usr/bin/env bash
 set -e
-# install jdk "manually"
-# depending on os, might want to do something like `apt remove default-jre openjdk-*-jre-*`
-cd /opt
-baseurl=https://download.oracle.com/java/21/latest/
-version=21.0.7
-if uname -m | grep aarch64; then
-  tarball=jdk-21_linux-aarch64_bin.tar.gz
-  sha=47372cfa9244dc74ec783a1b287381502419b564fbd0b18abc8f2d6b19ac865e
-else
-  tarball=jdk-21_linux-x64_bin.tar.gz
-  sha=267b10b14b4e5fada19aca3be3b961ce4f81f1bd3ffcd070e90a5586106125eb
-fi
-wget --quiet "$baseurl$tarball"
-echo "$sha" "$tarball" | sha256sum --check -
-sudo tar xf "$tarball"
-sudo tee /etc/profile.d/jdk.sh << EOF
+
+install_jdk() {
+  # install jdk "manually"
+  # depending on os, might want to do something like `apt remove default-jre openjdk-*-jre-*`
+  cd /opt
+  baseurl=https://download.oracle.com/java/21/latest/
+  version=21.0.7
+  if uname -m | grep aarch64; then
+    tarball=jdk-21_linux-aarch64_bin.tar.gz
+    sha=47372cfa9244dc74ec783a1b287381502419b564fbd0b18abc8f2d6b19ac865e
+  else
+    tarball=jdk-21_linux-x64_bin.tar.gz
+    sha=267b10b14b4e5fada19aca3be3b961ce4f81f1bd3ffcd070e90a5586106125eb
+  fi
+  wget --quiet "$baseurl$tarball"
+  echo "$sha" "$tarball" | sha256sum --check -
+  tar xf "$tarball"
+  tee /etc/profile.d/jdk.sh << EOF
 export JAVA_HOME="/opt/jdk-$version"
 export PATH=\$PATH:\$JAVA_HOME/bin
 EOF
-sudo chown -R root:jenkins "/opt/jdk-$version"
-sudo chmod -R g+rx "/opt/jdk-$version"
-if command -v update-alternatives; then
-  sudo update-alternatives --install /usr/bin/java java "/opt/jdk-$version/bin/java" 9999
+  chown -R root:jenkins "/opt/jdk-$version"
+  chmod -R g+rx "/opt/jdk-$version"
+  if command -v update-alternatives; then
+    update-alternatives --install /usr/bin/java java "/opt/jdk-$version/bin/java" 9999
+  else
+    ln -s "/opt/jdk-$version/bin/java" /usr/bin/java
+  fi
+  cd -
+}
+
+if [ "$(whoami)" = "root" ]; then
+  install_jdk
 else
-  sudo ln -s "/opt/jdk-$version/bin/java" /usr/bin/java
+  sudo bash -c install_jdk
 fi
-cd -

ci/setup-cfengine-build-host.sh

@@ -12,18 +12,25 @@ if [ "$(id -u)" != "0" ]; then
 fi
 
 ls -la /home/
+if ! id -u jenkins; then
+  useradd jenkins -p jenkins
+fi
+mkdir -p /home/jenkins
 chown -R jenkins /home/jenkins
 
+echo "checking for CFEngine install..."
 if [ -d /var/cfengine ]; then
   echo "Error: CFEngine already installed on this host. Will not proceed trying to setup build host with CFEngine temporary install."
   exit 1
 fi
 
-
 function cleanup()
 {
   set -ex
   if command -v apt 2>/dev/null; then
+    # workaround for CFE-4544, remove scriptlets call systemctl even when systemctl is-system-running returns false
+    rm /bin/systemctl
+    ln -s /bin/echo /bin/systemctl
     apt remove -y cfengine-nova || true
   elif command -v yum 2>/dev/null; then
     yum erase -y cfengine-nova || true
@@ -34,7 +41,8 @@ function cleanup()
     exit 1
   fi
   echo "Ensuring CFEngine fully uninstalled/cleaned up"
-  rm -rf /var/cfengine /opt/cfengine /var/log/CFE* /var/log/postgresql.log || true
+# keep these logs around for debugging failed setup runs
+#  rm -rf /var/cfengine /opt/cfengine /var/log/CFE* /var/log/postgresql.log || true
   if command -v pkill; then
     pkill -9 cf-agent || true
     pkill -9 cf-serverd || true