Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update packages testing #5622

Merged
merged 7 commits into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .github/workflows/gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/pkg_linux.yml

This file was deleted.

1 change: 0 additions & 1 deletion utils/docker/build-CI.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
67 changes: 0 additions & 67 deletions utils/docker/build-and-test-pmdk-packages.sh

This file was deleted.

9 changes: 9 additions & 0 deletions utils/docker/images/Dockerfile.fedora-37
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ ENV TESTS_DEPS "\
libunwind-devel \
ndctl \
openssh-server \
python3 \
strace"

# packaging dependencies
Expand All @@ -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

Expand All @@ -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
Expand Down
8 changes: 8 additions & 0 deletions utils/docker/images/Dockerfile.rockylinux-8
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
112 changes: 0 additions & 112 deletions utils/docker/packages/cleanup-packages.py

This file was deleted.

Loading