Merge pull request #5622 from lukaszstolarczuk/ci-packages

Update packages testing
pmem · May 15, 2023 · 1719502 · 1719502
2 parents 7f6fdab + 61fb7b5
commit 1719502
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 431 deletions.
diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml
@@ -26,16 +26,13 @@ jobs:
       SRC_CHECKERS: 0
     strategy:
       matrix:
-        CONFIG: ["N=1 OS=ubuntu OS_VER=22.04 FAULT_INJECTION=1 TEST_BUILD=debug",
+        CONFIG: ["N=1 OS=ubuntu OS_VER=22.04 FAULT_INJECTION=1 TEST_BUILD=debug PUSH_IMAGE=1",
                  "N=2 OS=ubuntu OS_VER=22.04 FAULT_INJECTION=1 TEST_BUILD=nondebug UBSAN=1",
                  "N=3 OS=ubuntu OS_VER=22.04 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=debug SRC_CHECKERS=1",
                  "N=4 OS=ubuntu OS_VER=22.04 PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug",
-                 "N=5 OS=fedora OS_VER=37    PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=debug",
+                 "N=5 OS=fedora OS_VER=37    PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=debug PUSH_IMAGE=1",
                  "N=6 OS=fedora OS_VER=37    PMDK_CC=clang PMDK_CXX=clang++ TEST_BUILD=nondebug AUTO_DOC_UPDATE=1",
-                 "N=7 OS=fedora OS_VER=37    MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 PUSH_IMAGE=1",
-                 "N=8 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PUSH_IMAGE=1",
-                 "N=9 OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PMDK_CC=clang PMDK_CXX=clang++",
-                 "N=10 OS=ubuntu OS_VER=22.04 COVERAGE=1 FAULT_INJECTION=1 TEST_BUILD=debug"
+                 "N=7 OS=ubuntu OS_VER=22.04 COVERAGE=1 FAULT_INJECTION=1 TEST_BUILD=debug"
                 ]
     steps:
       - name: Clone the git repo

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -30,10 +30,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        CONFIG: ["OS=debian OS_VER=11 FAULT_INJECTION=1 TEST_BUILD=debug",
+        CONFIG: ["OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n",
+                 "OS=ubuntu OS_VER=22.04 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 NDCTL_ENABLE=n PMDK_CC=clang PMDK_CXX=clang++",
+                 "OS=debian OS_VER=11 FAULT_INJECTION=1 TEST_BUILD=debug",
                  "OS=debian OS_VER=11 FAULT_INJECTION=1 TEST_BUILD=nondebug PUSH_IMAGE=1",
                  "OS=opensuse-leap OS_VER=15 FAULT_INJECTION=1 TEST_BUILD=debug",
-                 "OS=opensuse-leap OS_VER=15 FAULT_INJECTION=1 TEST_BUILD=nondebug PUSH_IMAGE=1",
+                 "OS=opensuse-leap OS_VER=15 FAULT_INJECTION=1 TEST_BUILD=nondebug",
+                 "OS=opensuse-leap OS_VER=15 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 PUSH_IMAGE=1",
                  "OS=rockylinux OS_VER=8 TEST_BUILD=debug",
                  "OS=rockylinux OS_VER=8 TEST_BUILD=nondebug",
                  "OS=rockylinux OS_VER=8 MAKE_PKG=1 EXPERIMENTAL=y VALGRIND=0 PUSH_IMAGE=1",

diff --git a/.github/workflows/pkg_linux.yml b/.github/workflows/pkg_linux.yml
diff --git a/utils/docker/build-CI.sh b/utils/docker/build-CI.sh
@@ -38,7 +38,6 @@ if [[ $MAKE_PKG -eq 1 ]] ; then command="./run-build-package.sh"; fi
 if [[ $COVERAGE -eq 1 ]] ; then command="./run-coverage.sh"; fi
 if [[ $BANDIT -eq 1 ]] ; then command="./run-bandit.sh"; fi
 if [[ "$COVERITY" -eq 1 ]]; then command="./run-coverity.sh"; fi
-if [[ $CHECK_PKGS -eq 1 ]] ; then command="./build-and-test-pmdk-packages.sh"; fi
 
 if [ -n "$DNS_SERVER" ]; then DNS_SETTING=" --dns=$DNS_SERVER "; fi
 if [[ -f $CI_FILE_SKIP_BUILD_PKG_CHECK ]]; then BUILD_PACKAGE_CHECK=n; else BUILD_PACKAGE_CHECK=y; fi

diff --git a/utils/docker/build-and-test-pmdk-packages.sh b/utils/docker/build-and-test-pmdk-packages.sh
diff --git a/utils/docker/images/Dockerfile.fedora-37 b/utils/docker/images/Dockerfile.fedora-37
@@ -55,6 +55,7 @@ ENV TESTS_DEPS "\
 	libunwind-devel \
 	ndctl \
 	openssh-server \
+	python3 \
 	strace"
 
 # packaging dependencies
@@ -70,13 +71,19 @@ ENV MISC_DEPS "\
 	lbzip2 \
 	man \
 	python3-flake8 \
+	python3-pip \
 	rsync \
 	shadow-utils \
 	sudo \
 	tar \
 	which \
 	xmlto"
 
+# python scripts dependencies
+ENV PYTHON_DEPS "\
+	distro \
+	xmlrunner"
+
 # Copy install valgrind script
 COPY install-valgrind.sh install-valgrind.sh
 
@@ -92,6 +99,8 @@ RUN dnf update -y && dnf install -y \
 	&& ./install-valgrind.sh fedora \
 	&& dnf clean all
 
+RUN pip3 install $PYTHON_DEPS
+
 # Add and switch user
 ENV USER pmdkuser
 ENV USERPASS pmdkpass

diff --git a/utils/docker/images/Dockerfile.rockylinux-8 b/utils/docker/images/Dockerfile.rockylinux-8
@@ -71,13 +71,19 @@ ENV MISC_DEPS "\
 	man \
 	python3 \
 	python3-flake8 \
+	python3-pip \
 	rsync \
 	shadow-utils \
 	sudo \
 	tar \
 	which \
 	xmlto"
 
+# python scripts dependencies
+ENV PYTHON_DEPS "\
+	distro \
+	xmlrunner"
+
 # Copy install valgrind script
 COPY install-valgrind.sh install-valgrind.sh
 
@@ -96,6 +102,8 @@ RUN dnf update -y && dnf install -y epel-release \
 	&& ./install-valgrind.sh rockylinux \
 	&& dnf clean all
 
+RUN pip3 install $PYTHON_DEPS
+
 # Add ans switch user
 ENV USER pmdkuser
 ENV USERPASS pmdkpass

diff --git a/utils/docker/packages/cleanup-packages.py b/utils/docker/packages/cleanup-packages.py