Merge pull request #1210 from lukaszstolarczuk/CI-updates

CI: minor updates

Author: KFilipek

.github/workflows/nightly.yml

@@ -29,6 +29,7 @@ jobs:
       fail-fast: false
       matrix:
         CONFIG: ["OS=centos OS_VER=8",
+                 "OS=almalinux OS_VER=8",
                  "OS=archlinux-base OS_VER=latest",
                  "OS=debian OS_VER=testing",
                  "OS=debian OS_VER=unstable",

utils/docker/images/Dockerfile.almalinux-8

@@ -0,0 +1,110 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright 2016-2021, Intel Corporation
+
+#
+# Dockerfile - a 'recipe' for Docker to build an image of almalinux-based
+#              environment prepared for running libpmemobj-cpp tests.
+#
+
+# Pull base image
+FROM registry.hub.docker.com/library/almalinux:8
+MAINTAINER [email protected]
+
+# Set required environment variables
+ENV OS almalinux
+ENV OS_VER 8
+ENV PACKAGE_MANAGER rpm
+ENV NOTTY 1
+
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
+# Base development packages
+ARG BASE_DEPS="\
+	cmake \
+	gcc \
+	gcc-c++ \
+	git \
+	make"
+
+# Dependencies for compiling libpmemobj-cpp project
+ARG LIBPMEMOBJ_CPP_DEPS="\
+	libatomic \
+	tbb-devel"
+
+# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+ARG PMDK_DEPS="\
+	autoconf \
+	automake \
+	daxctl-devel \
+	gdb \
+	man \
+	ndctl-devel \
+	pandoc \
+	python3 \
+	rpm-build \
+	rpm-build-libs \
+	rpmdevtools \
+	which"
+
+# pmem's Valgrind dependencies (optional; valgrind-devel package may be used instead)
+ARG VALGRIND_DEPS="\
+	autoconf \
+	automake"
+
+# Examples (optional)
+ARG EXAMPLES_DEPS="\
+	ncurses-devel"
+
+# Documentation (optional)
+ARG DOC_DEPS="\
+	doxygen"
+
+# Tests (optional)
+# NOTE: glibc is installed as a separate command; see below
+ARG TESTS_DEPS="\
+	gdb \
+	libunwind-devel"
+
+# Misc for our builds/CI (optional)
+ARG MISC_DEPS="\
+	clang \
+	passwd \
+	perl-Text-Diff \
+	pkgconf \
+	sudo"
+
+# Update package repository, extend dnf's package base and install basic tools
+RUN dnf update -y \
+ && dnf install -y epel-release \
+ && dnf install -y 'dnf-command(config-manager)' \
+ && dnf config-manager --set-enabled powertools \
+ && dnf update -y \
+ && dnf install -y --nobest \
+	${BASE_DEPS} \
+	${LIBPMEMOBJ_CPP_DEPS} \
+	${PMDK_DEPS} \
+	${VALGRIND_DEPS} \
+	${EXAMPLES_DEPS} \
+	${DOC_DEPS} \
+	${TESTS_DEPS} \
+	${MISC_DEPS} \
+ && dnf debuginfo-install -y glibc \
+ && dnf clean all
+
+# Install valgrind
+COPY install-valgrind.sh install-valgrind.sh
+RUN ./install-valgrind.sh
+
+# Install pmdk
+COPY install-pmdk.sh install-pmdk.sh
+RUN ./install-pmdk.sh rpm
+
+# Add user
+ENV USER user
+ENV USERPASS pass
+RUN useradd -m $USER \
+ && echo $USERPASS | passwd $USER --stdin \
+ && gpasswd wheel -a $USER
+USER $USER

utils/docker/images/install-pmdk.sh

@@ -16,8 +16,8 @@ fi
 
 PACKAGE_MANAGER=${1}
 
-# master: 1.11.0, 02.07.2021
-PMDK_VERSION="8583fcfd68764ac6779e6f93db89b06971b26704"
+# master: 1.11.1, 24.09.2021
+PMDK_VERSION="5b21904a257eff47f2e87fcbf2de46111f03ddd8"
 
 git clone https://github.com/pmem/pmdk
 cd pmdk

utils/docker/prepare-for-build.sh

@@ -12,7 +12,7 @@ set -e
 
 INSTALL_DIR=/tmp/libpmemobj-cpp
 EXAMPLE_TEST_DIR=/tmp/build_example
-TEST_DIR=${PMEMKV_TEST_DIR:-${DEFAULT_TEST_DIR}}
+TEST_DIR=${LIBPMEMOBJCPP_TEST_DIR:-${DEFAULT_TEST_DIR}}
 
 ### Helper functions, used in run-*.sh scripts
 function sudo_password() {

utils/docker/run-build.sh

@@ -14,7 +14,7 @@ set -e
 source $(dirname ${0})/prepare-for-build.sh
 
 # params set for this file; if not previously set, the right-hand param is used
-TEST_DIR=${PMEMKV_TEST_DIR:-${DEFAULT_TEST_DIR}}
+TEST_DIR=${LIBPMEMOBJCPP_TEST_DIR:-${DEFAULT_TEST_DIR}}
 CHECK_CPP_STYLE=${CHECK_CPP_STYLE:-ON}
 TESTS_LONG=${TESTS_LONG:-OFF}
 TESTS_TBB=${TESTS_TBB:-ON}