Merge pull request #1152 from lukaszstolarczuk/fix-CI-scripts

Fix CI scripts

Author: lukaszstolarczuk

.github/workflows/coverity.yml

@@ -1,5 +1,7 @@
 
 name: CPP-coverity
+# It runs static analysis build - Coverity. It requires special token (set in CI's secret).
+
 on:
   schedule:
     # run this job at 00:00 UTC everyday

.github/workflows/gha.yml

@@ -1,5 +1,5 @@
 name: CPP
-# It runs deafult OSes for each PR, push event or a new tag,
+# It runs default OSes for each PR, push event or a new tag,
 # checks basic builds with various compilers and executes all sets of tests.
 
 on:

.github/workflows/nightly.yml

@@ -13,7 +13,7 @@ env:
   CONTAINER_REG:  ghcr.io/pmem/libpmemobj-cpp
   HOST_WORKDIR:   ${{ github.workspace }}
   WORKDIR:        utils/docker
-  TEST_TIMEOUT:   600
+  TEST_TIMEOUT:   900
   IMG_VER:        latest
   TYPE:           debug
   PUSH_IMAGE:     1

.github/workflows/weekly.yml

@@ -13,7 +13,7 @@ env:
   CONTAINER_REG:  ghcr.io/pmem/libpmemobj-cpp
   HOST_WORKDIR:   ${{ github.workspace }}
   WORKDIR:        utils/docker
-  TEST_TIMEOUT:   600
+  TEST_TIMEOUT:   900
   IMG_VER:        latest
   PUSH_IMAGE:     0
 

utils/docker/build.sh

@@ -21,7 +21,7 @@
 
 set -e
 
-source $(dirname $0)/set-ci-vars.sh
+source $(dirname ${0})/set-ci-vars.sh
 IMG_VER=${IMG_VER:-devel}
 TAG="${OS}-${OS_VER}-${IMG_VER}"
 IMAGE_NAME=${CONTAINER_REG}:${TAG}
@@ -48,7 +48,7 @@ if [[ -z "${CONTAINER_REG}" ]]; then
 fi
 
 # Set command to execute in the Docker container
-if [[ -z "$COMMAND" ]]; then
+if [[ -z "${COMMAND}" ]]; then
 	echo "COMMAND will be based on the type of build: ${TYPE}"
 	case ${TYPE} in
 	debug)

utils/docker/images/Dockerfile.fedora-rawhide

@@ -47,6 +47,7 @@ ARG TESTS_DEPS="\
 	libpmem-devel \
 	libunwind-devel \
 	pmempool \
+	rpm-build \
 	valgrind-devel"
 
 # Misc for our builds/CI (optional)

utils/docker/prepare-for-build.sh

@@ -10,34 +10,15 @@
 
 set -e
 
-if [[ -z "${WORKDIR}" ]]; then
-	echo "ERROR: The variable WORKDIR has to contain a path to the root " \
-		"of this project - 'build' sub-directory will be created there."
-	exit 1
-fi
-
 INSTALL_DIR=/tmp/libpmemobj-cpp
 EXAMPLE_TEST_DIR=/tmp/build_example
 TEST_DIR=${PMEMKV_TEST_DIR:-${DEFAULT_TEST_DIR}}
 
+### Helper functions, used in run-*.sh scripts
 function sudo_password() {
 	echo ${USERPASS} | sudo -Sk $*
 }
 
-echo "Current WORKDIR content:"
-ls ${WORKDIR} -alh
-
-if [ "${CI_RUN}" == "YES" ]; then
-	echo "CI build: change WORKDIR's owner and prepare tmpfs device"
-	sudo_password chown -R $(id -u).$(id -g) ${WORKDIR}
-
-	sudo_password mkdir ${TEST_DIR}
-	sudo_password chmod 0777 ${TEST_DIR}
-	sudo_password mount -o size=2G -t tmpfs none ${TEST_DIR}
-fi || true
-
-
-## Helper functions, used in run-*.sh scripts
 function workspace_cleanup() {
 	echo "Cleanup build dirs"
 
@@ -92,3 +73,20 @@ function compile_example_standalone() {
 	make -j$(nproc)
 	cd -
 }
+
+### Additional checks, to be run, when this file is sourced
+if [[ -z "${WORKDIR}" ]]; then
+	echo "ERROR: The variable WORKDIR has to contain a path to the root " \
+		"of this project - 'build' sub-directory will be created there."
+	exit 1
+fi
+
+# this should be run only on CIs
+if [ "${CI_RUN}" == "YES" ]; then
+	echo "CI build: change WORKDIR's owner and prepare tmpfs device"
+	sudo_password chown -R $(id -u).$(id -g) ${WORKDIR}
+
+	sudo_password mkdir ${TEST_DIR}
+	sudo_password chmod 0777 ${TEST_DIR}
+	sudo_password mount -o size=2G -t tmpfs none ${TEST_DIR}
+fi || true

utils/docker/run-build.sh

@@ -215,23 +215,21 @@ function tests_package() {
 
 	[ ! "${TESTS_PACKAGES}" = "ON" ] && echo "Skipping testing packages, TESTS_PACKAGES variable is not set."
 
-	if ! ls /opt/pmdk-pkg/libpmem* > /dev/null 2>&1; then
-		echo "ERROR: There are no PMDK packages in /opt/pmdk-pkg - they are required for package test(s)."
-		printf "$(tput setaf 1)$(tput setab 7)BUILD ${FUNCNAME[0]} END$(tput sgr 0)\n\n"
-		return 1
-	fi
-
 	mkdir build
 	cd build
 
-	if [ ${PACKAGE_MANAGER} = "deb" ]; then
-		sudo_password dpkg -i /opt/pmdk-pkg/libpmem_*.deb /opt/pmdk-pkg/libpmem-dev_*.deb
-		sudo_password dpkg -i /opt/pmdk-pkg/libpmemobj_*.deb /opt/pmdk-pkg/libpmemobj-dev_*.deb
-	elif [ ${PACKAGE_MANAGER} = "rpm" ]; then
-		sudo_password rpm -i /opt/pmdk-pkg/libpmem*.rpm /opt/pmdk-pkg/pmdk-debuginfo-*.rpm
-	else
-		echo "ERROR: skipping building of packages because PACKAGE_MANAGER is not equal to 'rpm' nor 'deb' ..."
-		return 1
+	if ls /opt/pmdk-pkg/libpmem* > /dev/null 2>&1; then
+		echo "There are packages to install in '/opt/pmdk-pkg'"
+
+		if [ ${PACKAGE_MANAGER} = "deb" ]; then
+			sudo_password dpkg -i /opt/pmdk-pkg/libpmem_*.deb /opt/pmdk-pkg/libpmem-dev_*.deb
+			sudo_password dpkg -i /opt/pmdk-pkg/libpmemobj_*.deb /opt/pmdk-pkg/libpmemobj-dev_*.deb
+		elif [ ${PACKAGE_MANAGER} = "rpm" ]; then
+			sudo_password rpm -i /opt/pmdk-pkg/libpmem*.rpm /opt/pmdk-pkg/pmdk-debuginfo-*.rpm
+		else
+			echo "ERROR: we found packages to install, but PACKAGE_MANAGER is not set (to 'rpm', or 'deb')!"
+			return 1
+		fi
 	fi
 
 	CC=gcc CXX=g++ \