From 102949ba3551acff1d9c7342526653f1087fe43f Mon Sep 17 00:00:00 2001
From: Timothy Day <timday@amazon.com>
Date: Mon, 30 Dec 2024 16:44:39 -0500
Subject: [PATCH] LU-17000 contrib: update coverity-run script

Update coverity-run script to allow for builds on any
arbitrary RHEL8 host with ssh access. This removes the
strict dependency on Vagrant/libvirt.

Also, update the branch to master-next for Coverity builds
rather than master.

Test-Parameters: trivial
Signed-off-by: Timothy Day <timday@amazon.com>
Change-Id: Ic0a36ed2b090b5a839d3725fb7299c2ff93da525
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57607
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
---
 Vagrantfile                   |  18 -------
 contrib/coverity/coverity-run | 110 ++++++++++++++++++++++++++++++------------
 2 files changed, 78 insertions(+), 50 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 588fecf..989722a 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -42,23 +42,5 @@ Vagrant.configure("2") do |config|
       sed -i "s/$(hostname) //g" /etc/hosts
       echo "$GIVEN_IP $(hostname)" >> /etc/hosts
       grep $(hostname) /etc/hosts
-
-      # Add repos
-      dnf config-manager --set-enabled powertools
-      dnf config-manager --add-repo=https://downloads.whamcloud.com/public/e2fsprogs/latest/el8
-
-      # General kernel tools
-      dnf groupinstall -y 'Development Tools'
-
-      # Debug info (needed for ldiskfs)
-      sudo dnf install -y --enablerepo=*debug* kernel-debuginfo
-
-      # Install Lustre/ZFS dependencies and tools
-      dnf install -y --nogpgcheck git libyaml-devel libnl3-devel libmount-devel \
-          wget ncurses-devel bc dwarves kernel kernel-devel openssl-devel \
-          binutils-devel lsof crash kexec-tools perf psmisc e2fsprogs-devel \
-          elfutils-libelf-devel libudev-devel libattr-devel libaio-devel libuuid-devel \
-          libblkid-devel libtirpc-devel libffi-devel ncompress python3-cffi python3-devel \
-          python3-packaging
   SHELL
 end
diff --git a/contrib/coverity/coverity-run b/contrib/coverity/coverity-run
index 6e0db09..79d781c 100755
--- a/contrib/coverity/coverity-run
+++ b/contrib/coverity/coverity-run
@@ -6,7 +6,7 @@
 #
 # contrib/coverity/coverity-run
 #
-# Setup a simple VM for running Coverity builds
+# Script for running Coverity builds (and setup VMs)
 # to upload to https://scan.coverity.com/projects/lustre
 #
 # Author: Timothy Day <timday@amazon.com>
@@ -19,24 +19,25 @@ function cr_list() {
 	less -F <<EOF
 Usage: ${0##*/} [options]
 Helper for running Coverity builds for Lustre
-	setup         Create Vagrant VM.
+	setup         Test that ssh is working and setup needed VMs.
+	install       Install packages needed for build.
 	build         Build Lustre and dependencies. The users should
 		      validate the everything builds correctly.
 	run           Run Coverity scan. You must provide the path
 		      to the Coverity tool tarball using the COV_PATH
 		      env variable. This can be downloaded from the
 		      Coverity website.
-	clean         Remove Vagrant artifacts.
+	clean         Remove build/VM artifacts.
 	all           Run all of the above steps in order.
 	list          List all possible commands.
 
 The commands should be run in the following order:
 
-	setup -> build -> run -> clean
+	setup -> install -> build -> run -> clean
 
-The tool currently has a dependency on Vagrant and the 'libvirt'
-provider. After the scan is run, there will be a tar file in the
-'contrib/coverity' directory. This should be uploaded to Coverity
+To run this locally, both Vagrant and the 'libvirt' provider must be
+used. Otherwise, any remote host can be used. After the scan is run,
+there will be a tar file generated. This should be uploaded to Coverity
 via the web portal using the Lustre version output during the
 'run' step as the software version.
 EOF
@@ -47,14 +48,47 @@ EOF
 # Create VM using Vagrant.
 #
 function cr_setup() {
-	vagrant up
+	if [[ "$COV_SSH" =~ "vagrant" ]]; then
+		vagrant up
+		vagrant reload
+		vagrant ssh-config > vagrant-ssh.config
+	fi
 
-	# Save/test ssh config
-	vagrant ssh-config > vagrant-ssh.config
-	ssh -F vagrant-ssh.config default "uname -r"
+	ssh "$COV_SSH" "$COV_HOST" "uname -r"
+}
 
-	# Restart VM
-	vagrant reload
+#
+# Setup node to build Lustre and run Coverity
+#
+function cr_install() {
+	# Setup host
+	ssh "$COV_SSH" "$COV_HOST" <<EOF
+# Repo setup (for CentOS)
+sudo sed -i -e "s|mirrorlist=|#mirrorlist=|g" /etc/yum.repos.d/CentOS-*
+sudo sed -i -e "s|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g" /etc/yum.repos.d/CentOS-*
+
+# Add repos
+sudo dnf update -y
+sudo dnf config-manager --set-enabled powertools
+sudo dnf config-manager --add-repo=https://downloads.whamcloud.com/public/e2fsprogs/latest/el8
+sudo dnf install -d1 -y --enablerepo=*rhel-*rhui-*rpms libyaml-devel || true
+sudo dnf install -d1 -y --enablerepo=?ower?ools libyaml-devel || true
+sudo dnf install -y --enablerepo=*rhel-*rhui-*rpms libnl3-devel libmount-devel || true
+
+# General kernel tools
+sudo dnf groupinstall -y 'Development Tools'
+
+# Debug info (needed for ldiskfs)
+sudo dnf install -y --enablerepo=*debug* kernel-debuginfo
+
+# Install Lustre/ZFS dependencies and tools
+sudo dnf install -y --nogpgcheck git libyaml-devel libnl3-devel libmount-devel \
+          wget ncurses-devel bc kernel kernel-devel openssl-devel \
+          binutils-devel lsof crash kexec-tools perf psmisc e2fsprogs-devel \
+          elfutils-libelf-devel libudev-devel libattr-devel libaio-devel libuuid-devel \
+          libblkid-devel libtirpc-devel libffi-devel ncompress python3-cffi python3-devel
+sudo dnf install -y dwarves python3-packaging || true
+EOF
 }
 
 #
@@ -63,7 +97,7 @@ function cr_setup() {
 #
 function cr_build() {
 	# Build ZFS
-	ssh -F vagrant-ssh.config default <<EOF
+	ssh "$COV_SSH" "$COV_HOST" <<EOF
 # Grab repo
 rm -rf ~/zfs
 git clone https://github.com/openzfs/zfs.git
@@ -80,13 +114,14 @@ sudo make install
 EOF
 
 	# Build Lustre
-	ssh -F vagrant-ssh.config default <<EOF
+	ssh "$COV_SSH" "$COV_HOST" <<EOF
 # Grab repo
 rm -rf ~/lustre-release
 git clone git://git.whamcloud.com/fs/lustre-release.git
 
 # Build
 cd ~/lustre-release
+git checkout origin/master-next
 ./autogen.sh
 ./configure
 make -s -j\$(nproc)
@@ -107,17 +142,11 @@ EOF
 # cov-build.
 #
 function cr_run() {
-	# Check if COV_PATH is defined
-	if [[ -z ${COV_PATH+x} ]]; then
-		echo "Provide the path to the Coverity tool tarball using COV_PATH."
-		exit
-	fi
-
 	# Copy build tool to VM
-	scp -F vagrant-ssh.config "$COV_PATH" default:~
+	scp "$COV_SSH" "$COV_PATH" "$COV_HOST":~
 
 	# Run scan
-	ssh -F vagrant-ssh.config default <<EOF
+	ssh "$COV_SSH" "$COV_HOST" <<EOF
 # Get coverity tool
 cd ~
 tar xf *.tar.gz
@@ -136,28 +165,25 @@ cat LUSTRE-VERSION-FILE
 EOF
 
 	# Grab scan results
-	scp -F vagrant-ssh.config default:~/lustre-release/*.tgz .
+	scp "$COV_SSH" "$COV_HOST":~/lustre-release/*.tgz .
 }
 
 #
 # Destroy Vagrant VM.
 #
 function cr_clean() {
-	vagrant destroy
-	rm -f vagrant-ssh.config
+	if [[ "$COV_SSH" =~ "vagrant" ]]; then
+		vagrant destroy
+		rm -f vagrant-ssh.config
+	fi
 }
 
 #
 # Run all steps in the correct order.
 #
 function cr_all() {
-	# Check if COV_PATH is defined
-	if [[ -z ${COV_PATH+x} ]]; then
-		echo "Provide the path to the Coverity tool tarball using COV_PATH."
-		exit
-	fi
-
 	cr_setup
+	cr_install
 	cr_build
 	cr_run
 	cr_clean
@@ -169,11 +195,31 @@ if [[ "$EUID" -ne 0 ]]; then
 	exit
 fi
 
+# Check if COV_PATH is defined
+if [[ -z ${COV_PATH+x} ]]; then
+	echo "Provide the path to the Coverity tool tarball using COV_PATH."
+	exit
+fi
+
+# Check if COV_SSH is defined
+if [[ -z ${COV_SSH+x} || -z ${COV_HOST+x} ]]; then
+	export COV_SSH="-F vagrant-ssh.config"
+	export COV_HOST="default"
+	echo "Defaulting to Vagrant."
+
+	# Check if vagrant is actually installed
+	if ! command -v vagrant 2>&1 >/dev/null; then
+		echo "Vagrant could not be found."
+		exit 1
+	fi
+fi
+
 # Process options
 for arg in "$@"; do
 	shift
 	case "$arg" in
 		setup) cr_setup;;
+		install) cr_install;;
 		build) cr_build;;
 		run) cr_run;;
 		clean) cr_clean;;
-- 
1.8.3.1