From 1c488e6037c8b16dd85c2a6d04a14be619f9f4f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Fri, 16 Sep 2022 12:30:33 +0200 Subject: [PATCH 1/4] CI: update Fedora and Ubuntu to latest versions new versions of docker images are taken from the master branch --- .github/workflows/gha.yml | 20 ++-- .github/workflows/other_OSes.yml | 4 +- utils/docker/images/Dockerfile.fedora-32 | 80 ------------- utils/docker/images/Dockerfile.fedora-33 | 81 ------------- utils/docker/images/Dockerfile.fedora-35 | 106 +++++++++++++++++ utils/docker/images/Dockerfile.fedora-36 | 107 ++++++++++++++++++ ...e.ubuntu-20.10 => Dockerfile.ubuntu-22.04} | 104 ++++++++++++----- 7 files changed, 298 insertions(+), 204 deletions(-) delete mode 100644 utils/docker/images/Dockerfile.fedora-32 delete mode 100644 utils/docker/images/Dockerfile.fedora-33 create mode 100644 utils/docker/images/Dockerfile.fedora-35 create mode 100644 utils/docker/images/Dockerfile.fedora-36 rename utils/docker/images/{Dockerfile.ubuntu-20.10 => Dockerfile.ubuntu-22.04} (51%) diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml index fd2d1aafa9..10ba334a4d 100644 --- a/.github/workflows/gha.yml +++ b/.github/workflows/gha.yml @@ -26,15 +26,15 @@ jobs: WORKDIR: utils/docker strategy: matrix: - CONFIG: ["TYPE=debug OS=fedora OS_VER=32 PUSH_IMAGE=1", - "TYPE=debug OS=ubuntu OS_VER=20.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1", - "TYPE=debug OS=ubuntu OS_VER=20.04 COVERAGE=1", - "TYPE=release OS=fedora OS_VER=32", - "TYPE=release OS=ubuntu OS_VER=20.04", - "TYPE=valgrind OS=ubuntu OS_VER=20.04", - "TYPE=memcheck_drd OS=ubuntu OS_VER=20.04", - "TYPE=package OS=fedora OS_VER=32", - "TYPE=package OS=ubuntu OS_VER=20.04"] + CONFIG: ["TYPE=debug OS=fedora OS_VER=36 PUSH_IMAGE=1", + "TYPE=debug OS=ubuntu OS_VER=22.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1", + "TYPE=debug OS=ubuntu OS_VER=22.04 COVERAGE=1", + "TYPE=release OS=fedora OS_VER=36", + "TYPE=release OS=ubuntu OS_VER=22.04", + "TYPE=valgrind OS=ubuntu OS_VER=22.04", + "TYPE=memcheck_drd OS=ubuntu OS_VER=22.04", + "TYPE=package OS=fedora OS_VER=36", + "TYPE=package OS=ubuntu OS_VER=22.04"] steps: - name: Get release version if: github.event_name == 'release' @@ -85,7 +85,7 @@ jobs: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/stable-') strategy: matrix: - CONFIG: ["TYPE=doc OS=fedora OS_VER=32"] + CONFIG: ["TYPE=doc OS=fedora OS_VER=36"] steps: - name: Set image version for stable branch # doc update happens only on stable branch (not on PR), so we check only for heads ref diff --git a/.github/workflows/other_OSes.yml b/.github/workflows/other_OSes.yml index 8d6eb3ce99..d61e8c7133 100644 --- a/.github/workflows/other_OSes.yml +++ b/.github/workflows/other_OSes.yml @@ -30,13 +30,13 @@ jobs: "OS=archlinux-base OS_VER=latest", "OS=debian OS_VER=testing", "OS=debian OS_VER=unstable", - "OS=fedora OS_VER=33", + "OS=fedora OS_VER=35", "OS=fedora OS_VER=rawhide PUSH_IMAGE=0", "TYPE=package OS=fedora OS_VER=rawhide", "OS=opensuse-leap OS_VER=latest", "OS=opensuse-tumbleweed OS_VER=latest", "OS=ubuntu OS_VER=18.04", - "OS=ubuntu OS_VER=20.10", + "OS=ubuntu OS_VER=20.04", "OS=ubuntu OS_VER=rolling PUSH_IMAGE=0", "TYPE=package OS=ubuntu OS_VER=rolling"] steps: diff --git a/utils/docker/images/Dockerfile.fedora-32 b/utils/docker/images/Dockerfile.fedora-32 deleted file mode 100644 index a4199a00dc..0000000000 --- a/utils/docker/images/Dockerfile.fedora-32 +++ /dev/null @@ -1,80 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation - -# -# Dockerfile - a 'recipe' for Docker to build an image of fedora-based -# environment prepared for running libpmemobj-cpp tests. -# - -# Pull base image -FROM fedora:32 -MAINTAINER igor.chorazewicz@intel.com - -# Set required environment variables -ENV OS fedora -ENV OS_VER 32 -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 \ - asciidoc \ - autoconf \ - automake \ - bash-completion \ - clang \ - cmake \ - daxctl-devel \ - doxygen \ - gcc \ - gcc-c++ \ - gdb \ - git \ - hub \ - json-c-devel \ - kmod-devel \ - libatomic \ - libtool \ - libudev-devel \ - libunwind-devel \ - libuuid-devel \ - make \ - man \ - ncurses-devel \ - ndctl-devel \ - open-sans-fonts \ - pandoc \ - passwd \ - perl-Text-Diff \ - rpm-build \ - rpm-build-libs \ - rpmdevtools \ - SFML-devel \ - sudo \ - tar \ - tbb-devel \ - wget \ - which \ - xmlto \ - && 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 -RUN echo "$USER:$USERPASS" | chpasswd -RUN gpasswd wheel -a $USER -USER $USER diff --git a/utils/docker/images/Dockerfile.fedora-33 b/utils/docker/images/Dockerfile.fedora-33 deleted file mode 100644 index 09bbc7709e..0000000000 --- a/utils/docker/images/Dockerfile.fedora-33 +++ /dev/null @@ -1,81 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation - -# -# Dockerfile - a 'recipe' for Docker to build an image of fedora-based -# environment prepared for running libpmemobj-cpp tests. -# - -# Pull base image -FROM fedora:33 -MAINTAINER igor.chorazewicz@intel.com - -# Set required environment variables -ENV OS fedora -ENV OS_VER 33 -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 \ - asciidoc \ - autoconf \ - automake \ - bash-completion \ - clang \ - cmake \ - daxctl-devel \ - doxygen \ - gcc \ - gcc-c++ \ - gdb \ - git \ - hub \ - json-c-devel \ - kmod-devel \ - libatomic \ - libtool \ - libudev-devel \ - libunwind-devel \ - libuuid-devel \ - make \ - man \ - ncurses-devel \ - ndctl-devel \ - open-sans-fonts \ - pandoc \ - passwd \ - perl-Text-Diff \ - rpm-build \ - rpm-build-libs \ - rpmdevtools \ - SFML-devel \ - sudo \ - tar \ - tbb-devel \ - wget \ - which \ - xmlto \ - && dnf clean all - -# Install valgrind -COPY install-valgrind.sh install-valgrind.sh -RUN ./install-valgrind.sh - -# Install pmdk from sources, because of: -# https://github.com/pmem/pmdk/issues/4938 -COPY install-pmdk.sh install-pmdk.sh -RUN ./install-pmdk.sh - -# Add user -ENV USER user -ENV USERPASS pass -RUN useradd -m $USER -RUN echo "$USER:$USERPASS" | chpasswd -RUN gpasswd wheel -a $USER -USER $USER diff --git a/utils/docker/images/Dockerfile.fedora-35 b/utils/docker/images/Dockerfile.fedora-35 new file mode 100644 index 0000000000..487988974f --- /dev/null +++ b/utils/docker/images/Dockerfile.fedora-35 @@ -0,0 +1,106 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2016-2022, Intel Corporation + +# +# Dockerfile - a 'recipe' for Docker to build an image of fedora-based +# environment prepared for running libpmemobj-cpp tests. +# + +# Pull base image +FROM registry.fedoraproject.org/fedora:35 +MAINTAINER igor.chorazewicz@intel.com + +# Set required environment variables +ENV OS fedora +ENV OS_VER 35 +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 \ + SFML-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 \ + perl-Text-Diff \ + pkgconf \ + sudo" + +# Update packages and install basic tools +RUN dnf update -y \ + && dnf install -y \ + ${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 "$USER:$USERPASS" | chpasswd \ + && gpasswd wheel -a $USER +USER $USER \ No newline at end of file diff --git a/utils/docker/images/Dockerfile.fedora-36 b/utils/docker/images/Dockerfile.fedora-36 new file mode 100644 index 0000000000..0908d512b2 --- /dev/null +++ b/utils/docker/images/Dockerfile.fedora-36 @@ -0,0 +1,107 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2016-2022, Intel Corporation + +# +# Dockerfile - a 'recipe' for Docker to build an image of fedora-based +# environment prepared for running libpmemobj-cpp tests. +# + +# Pull base image +FROM registry.fedoraproject.org/fedora:36 +MAINTAINER igor.chorazewicz@intel.com + +# Set required environment variables +ENV OS fedora +ENV OS_VER 36 +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 (optional; valgrind-devel may be used instead) +ARG VALGRIND_DEPS="\ + autoconf \ + automake" + +# Examples (optional) +ARG EXAMPLES_DEPS="\ + ncurses-devel \ + SFML-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 \ + hub \ + perl-Text-Diff \ + pkgconf \ + sudo" + +# Update packages and install basic tools +RUN dnf update -y \ + && dnf install -y \ + ${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 "$USER:$USERPASS" | chpasswd \ + && gpasswd wheel -a $USER +USER $USER \ No newline at end of file diff --git a/utils/docker/images/Dockerfile.ubuntu-20.10 b/utils/docker/images/Dockerfile.ubuntu-22.04 similarity index 51% rename from utils/docker/images/Dockerfile.ubuntu-20.10 rename to utils/docker/images/Dockerfile.ubuntu-22.04 index bc93620932..ffa409e02e 100644 --- a/utils/docker/images/Dockerfile.ubuntu-20.10 +++ b/utils/docker/images/Dockerfile.ubuntu-22.04 @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation +# Copyright 2016-2022, Intel Corporation # # Dockerfile - a 'recipe' for Docker to build an image of ubuntu-based @@ -7,12 +7,12 @@ # # Pull base image -FROM ubuntu:20.10 +FROM registry.hub.docker.com/library/ubuntu:22.04 MAINTAINER igor.chorazewicz@intel.com # Set required environment variables ENV OS ubuntu -ENV OS_VER 20.10 +ENV OS_VER 22.04 ENV PACKAGE_MANAGER deb ENV NOTTY 1 @@ -21,43 +21,85 @@ ARG SKIP_VALGRIND_BUILD ARG SKIP_PMDK_BUILD ARG SKIP_SCRIPTS_DOWNLOAD -ENV DEBIAN_FRONTEND noninteractive +# Base development packages +ARG BASE_DEPS="\ + cmake \ + build-essential \ + git" -# Update the Apt cache and install basic tools -RUN apt-get update \ - && apt-get install -y software-properties-common \ - asciidoc \ +# Dependencies for compiling libpmemobj-cpp project +ARG LIBPMEMOBJ_CPP_DEPS="\ + libatomic1 \ + libtbb-dev" + +# PMDK's dependencies (optional; libpmemobj-dev package may be used instead) +ARG PMDK_DEPS="\ autoconf \ - clang \ - clang-format-9 \ - cmake \ - curl \ + automake \ debhelper \ devscripts \ - doxygen \ - gcc \ gdb \ - git \ - graphviz \ libdaxctl-dev \ - libjson-c-dev \ - libkmod-dev \ - libncurses5-dev \ libndctl-dev \ - libsfml-dev \ - libtbb-dev \ - libtext-diff-perl \ - libudev-dev \ - libunwind-dev \ - llvm \ pandoc \ - pkg-config \ + python3" + +# pmem's Valgrind dependencies (optional; valgrind package may be used instead) +ARG VALGRIND_DEPS="\ + autoconf \ + automake" + +# Examples (optional) +ARG EXAMPLES_DEPS="\ + libncurses5-dev \ + libsfml-dev" + +# Documentation (optional) +ARG DOC_DEPS="\ + doxygen \ + graphviz" + +# Tests (optional) +ARG TESTS_DEPS="\ + gdb \ + libc6-dbg \ + libunwind-dev" + +# Codecov - coverage tool (optional) +ARG CODECOV_DEPS="\ + curl \ + llvm" + +# Coverity - static analysis (optional) +ARG COVERITY_DEPS="\ + curl \ ruby \ + wget" + +# Misc for our builds/CI (optional) +ARG MISC_DEPS="\ + clang \ + clang-format-9 \ + libtext-diff-perl \ + pkg-config \ sudo \ - tzdata \ - uuid-dev \ - wget \ - whois \ + whois" + +ENV DEBIAN_FRONTEND noninteractive + +# Update the apt cache and install basic tools +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ${BASE_DEPS} \ + ${LIBPMEMOBJ_CPP_DEPS} \ + ${PMDK_DEPS} \ + ${VALGRIND_DEPS} \ + ${EXAMPLES_DEPS} \ + ${DOC_DEPS} \ + ${TESTS_DEPS} \ + ${CODECOV_DEPS} \ + ${COVERITY_DEPS} \ + ${MISC_DEPS} \ && rm -rf /var/lib/apt/lists/* # Install valgrind @@ -77,4 +119,4 @@ RUN ./download-scripts.sh ENV USER user ENV USERPASS pass RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS` -USER $USER +USER $USER \ No newline at end of file From 9fe106bce86469e9d8f421b4adf6cf2a9868dc47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Tue, 23 Aug 2022 12:58:07 +0200 Subject: [PATCH 2/4] docker: update pmdk installed version to 1.12.0 --- utils/docker/images/install-pmdk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/docker/images/install-pmdk.sh b/utils/docker/images/install-pmdk.sh index ed1bbcf111..60a72cad05 100755 --- a/utils/docker/images/install-pmdk.sh +++ b/utils/docker/images/install-pmdk.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2018-2021, Intel Corporation +# Copyright 2018-2022, Intel Corporation # # install-pmdk.sh - installs libpmem & libpmemobj @@ -11,8 +11,8 @@ set -e PACKAGE_MANAGER=${1} -# master: 1.11.0, 02.07.2021 -PMDK_VERSION="8583fcfd68764ac6779e6f93db89b06971b26704" +# common: 1.12.0 release, 24.05.2022 +PMDK_VERSION="73d8f958e855904dc0776a7d77d0f0d3698a65b1" if [ "${SKIP_PMDK_BUILD}" ]; then echo "Variable 'SKIP_PMDK_BUILD' is set; skipping building PMDK" From f802d36090f8c7d933a034679cfb9883fa91c243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Fri, 16 Sep 2022 12:33:43 +0200 Subject: [PATCH 3/4] tmp: check all OSes --- .github/workflows/gha.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml index 10ba334a4d..32a123557e 100644 --- a/.github/workflows/gha.yml +++ b/.github/workflows/gha.yml @@ -13,6 +13,7 @@ env: HOST_WORKDIR: ${{ github.workspace }} TEST_TIMEOUT: 600 IMG_VER: latest + TYPE: debug jobs: linux: @@ -25,6 +26,7 @@ jobs: FORCE_IMAGE_ACTION: ${{ secrets.FORCE_IMAGE_ACTION }} WORKDIR: utils/docker strategy: + fail-fast: false matrix: CONFIG: ["TYPE=debug OS=fedora OS_VER=36 PUSH_IMAGE=1", "TYPE=debug OS=ubuntu OS_VER=22.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1", @@ -34,7 +36,20 @@ jobs: "TYPE=valgrind OS=ubuntu OS_VER=22.04", "TYPE=memcheck_drd OS=ubuntu OS_VER=22.04", "TYPE=package OS=fedora OS_VER=36", - "TYPE=package OS=ubuntu OS_VER=22.04"] + "TYPE=package OS=ubuntu OS_VER=22.04", + "OS=centos OS_VER=8", + "OS=archlinux-base OS_VER=latest", + "OS=debian OS_VER=testing", + "OS=debian OS_VER=unstable", + "OS=fedora OS_VER=35", + "OS=fedora OS_VER=rawhide PUSH_IMAGE=0", + "TYPE=package OS=fedora OS_VER=rawhide", + "OS=opensuse-leap OS_VER=latest", + "OS=opensuse-tumbleweed OS_VER=latest", + "OS=ubuntu OS_VER=18.04", + "OS=ubuntu OS_VER=20.04", + "OS=ubuntu OS_VER=rolling PUSH_IMAGE=0", + "TYPE=package OS=ubuntu OS_VER=rolling"] steps: - name: Get release version if: github.event_name == 'release' From 00d2d2a05511e1729c20b5d3f735197e5f4e1af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Stolarczuk?= Date: Fri, 16 Sep 2022 14:11:48 +0200 Subject: [PATCH 4/4] tmp: various updates --- .github/workflows/gha.yml | 4 ++-- .github/workflows/other_OSes.yml | 2 +- utils/docker/images/Dockerfile.archlinux-base-latest | 2 +- utils/docker/images/Dockerfile.debian-testing | 3 +-- utils/docker/images/Dockerfile.debian-unstable | 3 +-- utils/docker/images/Dockerfile.opensuse-leap-latest | 2 +- utils/docker/images/Dockerfile.opensuse-tumbleweed-latest | 3 ++- utils/docker/images/Dockerfile.ubuntu-18.04 | 3 +-- utils/docker/images/Dockerfile.ubuntu-20.04 | 3 +-- utils/docker/images/Dockerfile.ubuntu-22.04 | 1 - utils/docker/images/Dockerfile.ubuntu-rolling | 3 +-- 11 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/gha.yml b/.github/workflows/gha.yml index 32a123557e..898906c50f 100644 --- a/.github/workflows/gha.yml +++ b/.github/workflows/gha.yml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: CONFIG: ["TYPE=debug OS=fedora OS_VER=36 PUSH_IMAGE=1", - "TYPE=debug OS=ubuntu OS_VER=22.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=1", + "TYPE=debug OS=ubuntu OS_VER=22.04 PUSH_IMAGE=1 CHECK_CPP_STYLE=0", "TYPE=debug OS=ubuntu OS_VER=22.04 COVERAGE=1", "TYPE=release OS=fedora OS_VER=36", "TYPE=release OS=ubuntu OS_VER=22.04", @@ -42,7 +42,7 @@ jobs: "OS=debian OS_VER=testing", "OS=debian OS_VER=unstable", "OS=fedora OS_VER=35", - "OS=fedora OS_VER=rawhide PUSH_IMAGE=0", + "OS=fedora OS_VER=rawhide PUSH_IMAGE=0 TESTS_PMREORDER=0", "TYPE=package OS=fedora OS_VER=rawhide", "OS=opensuse-leap OS_VER=latest", "OS=opensuse-tumbleweed OS_VER=latest", diff --git a/.github/workflows/other_OSes.yml b/.github/workflows/other_OSes.yml index d61e8c7133..47dc689693 100644 --- a/.github/workflows/other_OSes.yml +++ b/.github/workflows/other_OSes.yml @@ -31,7 +31,7 @@ jobs: "OS=debian OS_VER=testing", "OS=debian OS_VER=unstable", "OS=fedora OS_VER=35", - "OS=fedora OS_VER=rawhide PUSH_IMAGE=0", + "OS=fedora OS_VER=rawhide PUSH_IMAGE=0 TESTS_PMREORDER=0", "TYPE=package OS=fedora OS_VER=rawhide", "OS=opensuse-leap OS_VER=latest", "OS=opensuse-tumbleweed OS_VER=latest", diff --git a/utils/docker/images/Dockerfile.archlinux-base-latest b/utils/docker/images/Dockerfile.archlinux-base-latest index f15fffe58d..81edd329b6 100644 --- a/utils/docker/images/Dockerfile.archlinux-base-latest +++ b/utils/docker/images/Dockerfile.archlinux-base-latest @@ -72,6 +72,6 @@ RUN echo $USERPASS > $PFILE RUN echo $USERPASS >> $PFILE RUN passwd $USER < $PFILE RUN rm -f $PFILE -RUN sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers +RUN sed -i 's/# %wheel/%wheel/g' /etc/sudoers RUN gpasswd wheel -a $USER USER $USER diff --git a/utils/docker/images/Dockerfile.debian-testing b/utils/docker/images/Dockerfile.debian-testing index f9af7ad2aa..08204304ce 100644 --- a/utils/docker/images/Dockerfile.debian-testing +++ b/utils/docker/images/Dockerfile.debian-testing @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation +# Copyright 2016-2022, Intel Corporation # # Dockerfile - a 'recipe' for Docker to build an image of debian-based @@ -28,7 +28,6 @@ RUN apt-get update \ asciidoc \ autoconf \ clang \ - clang-format \ cmake \ curl \ debhelper \ diff --git a/utils/docker/images/Dockerfile.debian-unstable b/utils/docker/images/Dockerfile.debian-unstable index 54acdc2933..b9e5407a54 100644 --- a/utils/docker/images/Dockerfile.debian-unstable +++ b/utils/docker/images/Dockerfile.debian-unstable @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation +# Copyright 2016-2022, Intel Corporation # # Dockerfile - a 'recipe' for Docker to build an image of debian-based @@ -28,7 +28,6 @@ RUN apt-get update \ asciidoc \ autoconf \ clang \ - clang-format \ cmake \ curl \ debhelper \ diff --git a/utils/docker/images/Dockerfile.opensuse-leap-latest b/utils/docker/images/Dockerfile.opensuse-leap-latest index a463dc55e9..0749c94646 100644 --- a/utils/docker/images/Dockerfile.opensuse-leap-latest +++ b/utils/docker/images/Dockerfile.opensuse-leap-latest @@ -87,7 +87,7 @@ RUN echo $USERPASS > $PFILE RUN echo $USERPASS >> $PFILE RUN passwd $USER < $PFILE RUN rm -f $PFILE -RUN sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers +RUN sed -i 's/# %wheel/%wheel/g' /etc/sudoers RUN groupadd wheel RUN gpasswd wheel -a $USER USER $USER diff --git a/utils/docker/images/Dockerfile.opensuse-tumbleweed-latest b/utils/docker/images/Dockerfile.opensuse-tumbleweed-latest index 016b93e7c7..8e07c6fda7 100644 --- a/utils/docker/images/Dockerfile.opensuse-tumbleweed-latest +++ b/utils/docker/images/Dockerfile.opensuse-tumbleweed-latest @@ -56,6 +56,7 @@ RUN zypper install -y \ python3 \ rpm-build \ rpmdevtools \ + shadow \ sudo \ systemd \ tar \ @@ -89,7 +90,7 @@ RUN echo $USERPASS > $PFILE RUN echo $USERPASS >> $PFILE RUN passwd $USER < $PFILE RUN rm -f $PFILE -RUN sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers +RUN sed -i 's/# %wheel/%wheel/g' /etc/sudoers RUN groupadd wheel RUN gpasswd wheel -a $USER USER $USER diff --git a/utils/docker/images/Dockerfile.ubuntu-18.04 b/utils/docker/images/Dockerfile.ubuntu-18.04 index 6940375ef2..a066a226b2 100644 --- a/utils/docker/images/Dockerfile.ubuntu-18.04 +++ b/utils/docker/images/Dockerfile.ubuntu-18.04 @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation +# Copyright 2016-2022, Intel Corporation # # Dockerfile - a 'recipe' for Docker to build an image of ubuntu-based @@ -39,7 +39,6 @@ RUN apt-get update \ asciidoc \ autoconf \ clang \ - clang-format-9 \ cmake \ curl \ debhelper \ diff --git a/utils/docker/images/Dockerfile.ubuntu-20.04 b/utils/docker/images/Dockerfile.ubuntu-20.04 index 8d023a4e55..5ac4dd2ca6 100644 --- a/utils/docker/images/Dockerfile.ubuntu-20.04 +++ b/utils/docker/images/Dockerfile.ubuntu-20.04 @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation +# Copyright 2016-2022, Intel Corporation # # Dockerfile - a 'recipe' for Docker to build an image of ubuntu-based @@ -29,7 +29,6 @@ RUN apt-get update \ asciidoc \ autoconf \ clang \ - clang-format-9 \ cmake \ curl \ debhelper \ diff --git a/utils/docker/images/Dockerfile.ubuntu-22.04 b/utils/docker/images/Dockerfile.ubuntu-22.04 index ffa409e02e..6ba934889a 100644 --- a/utils/docker/images/Dockerfile.ubuntu-22.04 +++ b/utils/docker/images/Dockerfile.ubuntu-22.04 @@ -79,7 +79,6 @@ ARG COVERITY_DEPS="\ # Misc for our builds/CI (optional) ARG MISC_DEPS="\ clang \ - clang-format-9 \ libtext-diff-perl \ pkg-config \ sudo \ diff --git a/utils/docker/images/Dockerfile.ubuntu-rolling b/utils/docker/images/Dockerfile.ubuntu-rolling index 1e021c52d5..bf6fb9b3a2 100644 --- a/utils/docker/images/Dockerfile.ubuntu-rolling +++ b/utils/docker/images/Dockerfile.ubuntu-rolling @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright 2016-2021, Intel Corporation +# Copyright 2016-2022, Intel Corporation # # Dockerfile - a 'recipe' for Docker to build an image of ubuntu-based @@ -28,7 +28,6 @@ RUN apt-get update \ asciidoc \ autoconf \ clang \ - clang-format-9 \ cmake \ curl \ debhelper \