Merge pull request #735 from lukaszstolarczuk/cleanup-CI-files

Cleanup CI files

Author: igchor

.github/workflows/gha.yml

@@ -11,6 +11,7 @@ name: CPP
 on: [push, pull_request]
 
 env:
+    REPO:           libpmemobj-cpp
     GITHUB_REPO:    pmem/libpmemobj-cpp
     DOCKERHUB_REPO: pmem/libpmemobj-cpp
 
@@ -19,6 +20,8 @@ jobs:
     name: Linux
     runs-on: ubuntu-latest
     env:
+      DOCKERHUB_USER:          ${{ secrets.DOCKERHUB_USER }}
+      DOCKERHUB_PASSWORD:      ${{ secrets.DOCKERHUB_PASSWORD }}
       HOST_WORKDIR:   /home/runner/work/libpmemobj-cpp/libpmemobj-cpp
       WORKDIR:        utils/docker
     strategy:
@@ -35,10 +38,9 @@ jobs:
                 "N=10 OS=ubuntu OS_VER=19.10 TYPE=coverity"]
     steps:
        - name: Clone the git repo
-         uses: actions/checkout@v1
-
-       - name: Change ownership of the repo
-         run: sudo chown -R 1000.1000 $HOST_WORKDIR
+         uses: actions/checkout@v2
+         with:
+            fetch-depth: 50
 
        - name: Pull or rebuild the image
          run: cd $WORKDIR && ${{ matrix.CONFIG }} ./pull-or-rebuild-image.sh
@@ -85,7 +87,9 @@ jobs:
             key:  vcpkg-installed-45e5a67
 
        - name: Clone the git repo
-         uses: actions/checkout@v1
+         uses: actions/checkout@v2
+         with:
+            fetch-depth: 50
 
        - name: Use old vcpkg for pmdk to build properly
          working-directory: C:/vcpkg

utils/docker/build.sh

@@ -32,44 +32,47 @@
 
 #
 # build-local.sh - runs a Docker container from a Docker image with environment
-#                  prepared for running libpmemobj-cpp tests and run those tests.
+#                  prepared for running libpmemobj-cpp builds and tests.
 #
 #
 # Notes:
 # - run this script from its location or set the variable 'HOST_WORKDIR' to
 #   where the root of this project is on the host machine,
 # - set variables 'OS' and 'OS_VER' properly to a system you want to build this
 #	repo on (for proper values take a look on the list of Dockerfiles at the
-#   utils/docker/images directory), e.g. OS=ubuntu, OS_VER=19.04.
+#   utils/docker/images directory), e.g. OS=ubuntu, OS_VER=19.10.
 #
 
 set -e
+
+source $(dirname $0)/set-ci-vars.sh
+source $(dirname $0)/set-vars.sh
 source $(dirname $0)/valid-branches.sh
 
-# Environment variables that can be customized (default values are after dash):
-export KEEP_CONTAINER=${KEEP_CONTAINER:-0}
+if [[ "$CI_EVENT_TYPE" != "cron" && "$CI_BRANCH" != "coverity_scan" \
+	&& "$TYPE" == "coverity" ]]; then
+	echo "INFO: Skip Coverity scan job if build is triggered neither by " \
+		"'cron' nor by a push to 'coverity_scan' branch"
+	exit 0
+fi
 
+if [[ ( "$CI_EVENT_TYPE" == "cron" || "$CI_BRANCH" == "coverity_scan" )\
+	&& "$TYPE" != "coverity" ]]; then
+	echo "INFO: Skip regular jobs if build is triggered either by 'cron'" \
+		" or by a push to 'coverity_scan' branch"
+	exit 0
+fi
 
 if [[ -z "$OS" || -z "$OS_VER" ]]; then
 	echo "ERROR: The variables OS and OS_VER have to be set " \
-		"(e.g. OS=ubuntu, OS_VER=19.04)."
+		"(eg. OS=fedora, OS_VER=31)."
 	exit 1
 fi
 
 if [[ -z "$HOST_WORKDIR" ]]; then
-	HOST_WORKDIR=$(readlink -f ../..)
-fi
-
-if [[ "$TRAVIS_EVENT_TYPE" == "cron" || "$TRAVIS_BRANCH" == "coverity_scan" ]]; then
-	if [[ "$TYPE" != "coverity" ]]; then
-		echo "Skipping non-Coverity job for cron/Coverity build"
-		exit 0
-	fi
-else
-	if [[ "$TYPE" == "coverity" ]]; then
-		echo "Skipping Coverity job for non cron/Coverity build"
-		exit 0
-	fi
+	echo "ERROR: The variable HOST_WORKDIR has to contain a path to " \
+		"the root of this project on the host machine"
+	exit 1
 fi
 
 imageName=${DOCKERHUB_REPO}:1.9-${OS}-${OS_VER}
@@ -114,20 +117,20 @@ fi
 if [ -n "$DNS_SERVER" ]; then DNS_SETTING=" --dns=$DNS_SERVER "; fi
 
 # Only run doc update on $GITHUB_REPO master or stable branch
-if [[ -z "${TRAVIS_BRANCH}" || -z "${TARGET_BRANCHES[${TRAVIS_BRANCH}]}" || "$TRAVIS_PULL_REQUEST" != "false" || "$TRAVIS_REPO_SLUG" != "${GITHUB_REPO}" ]]; then
+if [[ -z "${CI_BRANCH}" || -z "${TARGET_BRANCHES[${CI_BRANCH}]}" || "$CI_EVENT_TYPE" == "pull_request" || "$CI_REPO_SLUG" != "${GITHUB_REPO}" ]]; then
 	AUTO_DOC_UPDATE=0
 fi
 
-WORKDIR=/libpmemobj-cpp
-SCRIPTSDIR=$WORKDIR/utils/docker
-
-# check if we are running on a CI (Travis or GitHub Actions)
+# Check if we are running on a CI (Travis or GitHub Actions)
 [ -n "$GITHUB_ACTIONS" -o -n "$TRAVIS" ] && CI_RUN="YES" || CI_RUN="NO"
 
 # do not allocate a pseudo-TTY if we are running on GitHub Actions
 [ ! $GITHUB_ACTIONS ] && TTY='-t' || TTY=''
 
-echo Building ${OS}-${OS_VER}
+WORKDIR=/libpmemobj-cpp
+SCRIPTSDIR=$WORKDIR/utils/docker
+
+echo Building on ${OS}-${OS_VER}
 
 # Run a container with
 #  - environment variables set (--env)
@@ -138,21 +141,26 @@ docker run --privileged=true --name=$containerName -i $TTY \
 	${docker_opts} \
 	--env http_proxy=$http_proxy \
 	--env https_proxy=$https_proxy \
-	--env AUTO_DOC_UPDATE=$AUTO_DOC_UPDATE \
-	--env GITHUB_TOKEN=$GITHUB_TOKEN \
 	--env WORKDIR=$WORKDIR \
 	--env SCRIPTSDIR=$SCRIPTSDIR \
-	--env TRAVIS_REPO_SLUG=$TRAVIS_REPO_SLUG \
-	--env TRAVIS_BRANCH=$TRAVIS_BRANCH \
-	--env TRAVIS_EVENT_TYPE=$TRAVIS_EVENT_TYPE \
+	--env COVERAGE=$COVERAGE \
+	--env AUTO_DOC_UPDATE=$AUTO_DOC_UPDATE \
+	--env CI_RUN=$CI_RUN \
+	--env TRAVIS=$TRAVIS \
+	--env GITHUB_REPO=$GITHUB_REPO \
+	--env CI_COMMIT_RANGE=$CI_COMMIT_RANGE \
+	--env CI_COMMIT=$CI_COMMIT \
+	--env CI_REPO_SLUG=$CI_REPO_SLUG \
+	--env CI_BRANCH=$CI_BRANCH \
+	--env CI_EVENT_TYPE=$CI_EVENT_TYPE \
+	--env GITHUB_TOKEN=$GITHUB_TOKEN \
 	--env COVERITY_SCAN_TOKEN=$COVERITY_SCAN_TOKEN \
 	--env COVERITY_SCAN_NOTIFICATION_EMAIL=$COVERITY_SCAN_NOTIFICATION_EMAIL \
-	--env COVERAGE=$COVERAGE \
 	--env CHECK_CPP_STYLE=${CHECK_CPP_STYLE:-ON} \
 	--env TESTS_LONG=${TESTS_LONG:-OFF} \
 	--env TESTS_TBB=${TESTS_TBB:-ON} \
-	--env CI_RUN=$CI_RUN \
 	--env TZ='Europe/Warsaw' \
+	--shm-size=4G \
 	-v $HOST_WORKDIR:$WORKDIR \
 	-v /etc/localtime:/etc/localtime \
 	-w $SCRIPTSDIR \

utils/docker/images/Dockerfile.archlinux-base-latest

@@ -30,14 +30,24 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #
-# Dockerfile - a 'recipe' for Docker to build an image of environment 
-#              prepared for running libpmemobj-cpp tests.
+Dockerfile - a 'recipe' for Docker to build an image of archlinux-based
+#              environment prepared for running libpmemobj-cpp tests.
 #
 
 # Pull base image
 FROM archlinux/base:latest
 MAINTAINER szymon.romik@intel.com
 
+# Set required environment variables
+ENV OS archlinux-base
+ENV OS_VER latest
+ENV PACKAGE_MANAGER pacman
+ENV NOTTY 1
+
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 # Update the Apt cache and install basic tools
 RUN pacman -Syu --noconfirm
 RUN pacman -S --noconfirm \
@@ -95,9 +105,3 @@ USER $USER
 
 # Clean the cache of packages
 RUN rm -rf /var/cache/pacman/pkg/*
-
-# Set required environment variables
-ENV OS archlinux-base
-ENV OS_VER latest
-ENV PACKAGE_MANAGER pacman
-ENV NOTTY 1

utils/docker/images/Dockerfile.centos-8

@@ -38,6 +38,16 @@
 FROM centos:8
 MAINTAINER szymon.romik@intel.com
 
+# Set required environment variables
+ENV OS centos
+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
+
 RUN dnf update -y
 RUN dnf install -y epel-release
 RUN dnf install -y 'dnf-command(config-manager)'
@@ -103,10 +113,3 @@ RUN useradd -m $USER
 RUN echo $USERPASS | passwd $USER --stdin
 RUN gpasswd wheel -a $USER
 USER $USER
-
-# Set required environment variables
-ENV OS centos
-ENV OS_VER 8
-ENV PACKAGE_MANAGER rpm
-ENV NOTTY 1
-

utils/docker/images/Dockerfile.debian-testing

@@ -30,14 +30,24 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #
-# Dockerfile - a 'recipe' for Docker to build an image of debian-unstable
+# Dockerfile - a 'recipe' for Docker to build an image of debian-based
 #              environment prepared for running libpmemobj-cpp tests.
 #
 
 # Pull base image
 FROM debian:testing
 MAINTAINER szymon.romik@intel.com
 
+# Set required environment variables
+ENV OS debian
+ENV OS_VER testing
+ENV PACKAGE_MANAGER deb
+ENV NOTTY 1
+
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update the Apt cache and install basic tools
@@ -90,9 +100,3 @@ ENV USER user
 ENV USERPASS pass
 RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
 USER $USER
-
-# Set required environment variables
-ENV OS debian
-ENV OS_VER testing
-ENV PACKAGE_MANAGER deb
-ENV NOTTY 1

utils/docker/images/Dockerfile.debian-unstable

@@ -30,14 +30,24 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #
-# Dockerfile - a 'recipe' for Docker to build an image of debian-unstable
+# Dockerfile - a 'recipe' for Docker to build an image of debian-based
 #              environment prepared for running libpmemobj-cpp tests.
 #
 
 # Pull base image
 FROM debian:unstable
 MAINTAINER szymon.romik@intel.com
 
+# Set required environment variables
+ENV OS debian
+ENV OS_VER unstable
+ENV PACKAGE_MANAGER deb
+ENV NOTTY 1
+
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update the Apt cache and install basic tools
@@ -90,9 +100,3 @@ ENV USER user
 ENV USERPASS pass
 RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
 USER $USER
-
-# Set required environment variables
-ENV OS debian
-ENV OS_VER unstable
-ENV PACKAGE_MANAGER deb
-ENV NOTTY 1

utils/docker/images/Dockerfile.fedora-31

@@ -38,6 +38,16 @@
 FROM fedora:31
 MAINTAINER szymon.romik@intel.com
 
+# Set required environment variables
+ENV OS fedora
+ENV OS_VER 31
+ENV PACKAGE_MANAGER rpm
+ENV NOTTY 1
+
+# Additional parameters to build docker without building components
+ARG SKIP_VALGRIND_BUILD
+ARG SKIP_PMDK_BUILD
+
 # Install basic tools
 RUN dnf update -y \
  && dnf install -y \
@@ -93,10 +103,3 @@ RUN useradd -m $USER
 RUN echo "$USER:$USERPASS" | chpasswd
 RUN gpasswd wheel -a $USER
 USER $USER
-
-# Set required environment variables
-ENV OS fedora
-ENV OS_VER 31
-ENV PACKAGE_MANAGER rpm
-ENV NOTTY 1
-

utils/docker/images/Dockerfile.fedora-rawhide

@@ -38,6 +38,12 @@
 FROM fedora:rawhide
 MAINTAINER szymom.romik@intel.com
 
+# Set required environment variables
+ENV OS fedora
+ENV OS_VER rawhide
+ENV PACKAGE_MANAGER rpm
+ENV NOTTY 1
+
 # Additional parameters to build docker without building components
 ARG SKIP_VALGRIND_BUILD
 ARG SKIP_PMDK_BUILD
@@ -56,6 +62,7 @@ RUN dnf update -y \
 	daxctl-devel \
 	doxygen \
 	gcc \
+	gcc-c++ \
 	gdb \
 	git \
 	hub \
@@ -100,10 +107,3 @@ RUN useradd -m $USER
 RUN echo "$USER:$USERPASS" | chpasswd
 RUN gpasswd wheel -a $USER
 USER $USER
-
-# Set required environment variables
-ENV OS fedora
-ENV OS_VER rawhide
-ENV PACKAGE_MANAGER rpm
-ENV NOTTY 1
-