diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 46b685e493..f378f17825 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [centos-8, centos-9, alma-9] + distro: [centos-9, alma-9] container: quay.io/ovirt/vdsm-test:${{ matrix.distro }} steps: - uses: ovirt/checkout-action@main @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [centos-8, centos-9, alma-9] + distro: [centos-9, alma-9] container: image: quay.io/ovirt/vdsm-test:${{ matrix.distro }} # Required to create loop devices. @@ -40,7 +40,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [centos-8, centos-9, alma-9] + distro: [centos-9, alma-9] container: image: quay.io/ovirt/vdsm-test:${{ matrix.distro }} # Required to create loop devices. @@ -56,7 +56,7 @@ jobs: strategy: fail-fast: false matrix: - distro: [centos-8, centos-9, alma-9] + distro: [centos-9, alma-9] container: image: quay.io/ovirt/vdsm-test:${{ matrix.distro }} # Needed for many operations, i.e. creating bridges @@ -71,8 +71,6 @@ jobs: fail-fast: false matrix: include: - - name: el8 - container-name: el8stream - name: el9 container-name: el9stream name: ${{ matrix.name }} diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 1f96a525a6..1374042859 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -32,7 +32,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 # Override language selection by uncommenting this and choosing your languages # with: # languages: go, javascript, csharp, python, cpp, java @@ -40,7 +40,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -54,4 +54,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/containers.yml b/.github/workflows/containers.yml index 0ae1f5512c..5349bf6a9f 100644 --- a/.github/workflows/containers.yml +++ b/.github/workflows/containers.yml @@ -33,7 +33,7 @@ jobs: uses: redhat-actions/push-to-registry@v2 with: image: ovirt/vdsm-network-tests-${{ matrix.container }} - tags: alma-9 centos-8 centos-9 + tags: alma-9 centos-9 registry: ${{ env.IMAGE_REGISTRY }} username: ${{ secrets.QUAY_USERNAME }} password: ${{ secrets.QUAY_TOKEN }} @@ -44,7 +44,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - distro: [ centos-8, centos-9, alma-9 ] + distro: [ centos-9, alma-9 ] steps: - uses: ovirt/checkout-action@main - name: Install dependencies diff --git a/.github/workflows/network.yml b/.github/workflows/network.yml index b6bf3b2f68..1053ef0b43 100644 --- a/.github/workflows/network.yml +++ b/.github/workflows/network.yml @@ -30,12 +30,7 @@ jobs: fail-fast: false matrix: type: [ unit, integration, functional ] - tag: [ alma-9, centos-8 ] - include: - - type: unit - tag: centos-9 - - type: integration - tag: centos-9 + tag: [ alma-9, centos-9 ] steps: - uses: ovirt/checkout-action@main - name: Install dependencies diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a51565e87..640c0a90c2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Red Hat, Inc. # SPDX-License-Identifier: GPL-2.0-or-later -image: quay.io/ovirt/vdsm-test-centos-8 +image: quay.io/ovirt/vdsm-test-centos-9 variables: TRAVIS_CI: 1 @@ -19,7 +19,7 @@ rpm: script: - ./ci/rpm.sh artifacts: - name: "rpm-centos-8" + name: "rpm-centos-9" paths: - "$EXPORT_DIR/" expire_in: 1 week diff --git a/README.md b/README.md index ec341da702..571fccad3d 100644 --- a/README.md +++ b/README.md @@ -44,9 +44,9 @@ date, please check the [Gerrit vdsm project](https://gerrit.ovirt.org/q/project: Add ovirt repositories to your repositories list. -For CentOS Stream 8 use: +For CentOS Stream 9 use: - sudo dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-8 + sudo dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-9 sudo dnf install -y ovirt-release-master For more info see diff --git a/docker/Dockerfile.alma-9 b/docker/Dockerfile.alma-9 index 59646f467b..3b0ba22165 100644 --- a/docker/Dockerfile.alma-9 +++ b/docker/Dockerfile.alma-9 @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Red Hat, Inc. # SPDX-License-Identifier: GPL-2.0-or-later -FROM quay.io/almalinux/almalinux:9.0 +FROM quay.io/almalinuxorg/almalinux:9 # Add runtime dependencies. RUN dnf install -y 'dnf-command(copr)' \ diff --git a/docker/Dockerfile.centos-8 b/docker/Dockerfile.centos-8 deleted file mode 100644 index aac5ba34aa..0000000000 --- a/docker/Dockerfile.centos-8 +++ /dev/null @@ -1,80 +0,0 @@ -# SPDX-FileCopyrightText: Red Hat, Inc. -# SPDX-License-Identifier: GPL-2.0-or-later - -FROM quay.io/centos/centos:stream8 - -# Add runtime dependencies. -RUN dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-8 \ - && dnf install -y ovirt-release-master \ - && dnf update -y \ - && dnf install -y \ - autoconf \ - automake \ - createrepo_c \ - dnf-utils \ - dosfstools \ - e2fsprogs \ - gcc \ - gdb \ - genisoimage \ - git \ - glusterfs-api \ - iproute-tc \ - iscsi-initiator-utils \ - lshw \ - lsof \ - lvm2 \ - make \ - mom \ - NetworkManager \ - nmstate \ - nmstate-plugin-ovsdb \ - openssl \ - ovirt-imageio-client \ - psmisc \ - python3 \ - python3-augeas \ - python3-blivet \ - python3-cryptography \ - python3-dateutil \ - python3-dbus \ - python3-decorator \ - python3-devel \ - python3-dmidecode \ - python3-ioprocess \ - python3-libselinux \ - python3-libvirt \ - python3-magic \ - python3-nose \ - python3-pip \ - python3-requests \ - python3-rpm \ - python3-sanlock \ - python3-six \ - python3-yaml \ - qemu-img \ - redhat-rpm-config \ - rpm-build \ - sanlock \ - sudo \ - systemd \ - systemd-udev \ - which \ - xfsprogs \ - && dnf clean all - -# Create vdsm user with groups kvm,qemu,sanlock -RUN useradd --system -m -u 36 -N -G 36,107,179 vdsm - -# Add gdb python support. -RUN debuginfo-install -y python3 \ - && dnf clean all - -# Add development packages -COPY requirements.txt requirements.txt -RUN python3 -m pip install --upgrade pip \ - && python3 -m venv --system-site-packages /venv \ - && /venv/bin/python3 -m pip install --requirement requirements.txt - -# Add lvm configuration. -COPY lvmlocal.conf /etc/lvm/ diff --git a/docker/Makefile b/docker/Makefile index 5683c47e9f..114268593f 100644 --- a/docker/Makefile +++ b/docker/Makefile @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Red Hat, Inc. # SPDX-License-Identifier: GPL-2.0-or-later -targets := alma-9 centos-8 centos-9 +targets := alma-9 centos-9 prefix := ovirt/vdsm-test .PHONY: $(targets) push diff --git a/docker/network/Makefile b/docker/network/Makefile index f80a505f99..2192edda97 100644 --- a/docker/network/Makefile +++ b/docker/network/Makefile @@ -4,7 +4,7 @@ CONTAINER_CMD := podman PREFIX := ovirt/vdsm-network-tests -targets := alma-9 centos-8 centos-9 +targets := alma-9 centos-9 types := functional integration unit .PHONY: $(targets) $(types) diff --git a/docker/network/functional/Dockerfile.alma-9 b/docker/network/functional/Dockerfile.alma-9 index 7055db325b..02003fe98e 100644 --- a/docker/network/functional/Dockerfile.alma-9 +++ b/docker/network/functional/Dockerfile.alma-9 @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Red Hat, Inc. # SPDX-License-Identifier: GPL-2.0-or-later -FROM quay.io/almalinux/almalinux:9.0 +FROM quay.io/almalinuxorg/almalinux:9 # Use legacy cryptopolicy as workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2059101 # until https://pagure.io/copr/copr/issue/2106 is fixed diff --git a/docker/network/functional/Dockerfile.centos-8 b/docker/network/functional/Dockerfile.centos-8 deleted file mode 100644 index 98648f1668..0000000000 --- a/docker/network/functional/Dockerfile.centos-8 +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-FileCopyrightText: Red Hat, Inc. -# SPDX-License-Identifier: GPL-2.0-or-later - -FROM quay.io/centos/centos:stream8 - -# Add runtime dependencies. -RUN dnf -y install dnf-plugins-core \ - && \ - dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-8 \ - && \ - dnf install -y ovirt-release-master \ - && \ - dnf update -y \ - && \ - dnf install -y \ - autoconf \ - automake \ - dnsmasq \ - git \ - make \ - python3 \ - python3-devel \ - python3-pip \ - python3-yaml \ - systemd \ - systemd-udev \ - # Install vdsm-network for its dependencies - vdsm-network \ - && \ - dnf remove -y --noautoremove vdsm-network \ - && \ - dnf clean all - -# Add pytest -RUN python3 -m pip install --upgrade pip \ - && \ - python3 -m pip install pytest - -CMD ["/usr/sbin/init"] diff --git a/docker/network/integration/Dockerfile.alma-9 b/docker/network/integration/Dockerfile.alma-9 index 6ba688435d..7f69b79561 100644 --- a/docker/network/integration/Dockerfile.alma-9 +++ b/docker/network/integration/Dockerfile.alma-9 @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Red Hat, Inc. # SPDX-License-Identifier: GPL-2.0-or-later -FROM quay.io/almalinux/almalinux:9.0 +FROM quay.io/almalinuxorg/almalinux:9 # Use legacy cryptopolicy as workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2059101 # until https://pagure.io/copr/copr/issue/2106 is fixed diff --git a/docker/network/integration/Dockerfile.centos-8 b/docker/network/integration/Dockerfile.centos-8 deleted file mode 100644 index 78cfc39ff6..0000000000 --- a/docker/network/integration/Dockerfile.centos-8 +++ /dev/null @@ -1,36 +0,0 @@ -# SPDX-FileCopyrightText: Red Hat, Inc. -# SPDX-License-Identifier: GPL-2.0-or-later - -FROM quay.io/centos/centos:stream8 - -# Add runtime dependencies. -RUN dnf -y install dnf-plugins-core \ - && \ - dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-8 \ - && \ - dnf install -y ovirt-release-master \ - && \ - dnf update -y \ - && \ - dnf install -y \ - autoconf \ - automake \ - dnsmasq \ - git \ - make \ - python3-devel \ - python3-pip \ - systemd \ - # Install vdsm-network for its dependencies - vdsm-network \ - && \ - dnf remove -y --noautoremove vdsm-network \ - && \ - dnf clean all - -# Add pytest -RUN python3 -m pip install --upgrade pip \ - && \ - python3 -m pip install pytest - -CMD ["/usr/sbin/init"] diff --git a/docker/network/unit/Dockerfile.alma-9 b/docker/network/unit/Dockerfile.alma-9 index 07fb5ceb9f..128472a719 100644 --- a/docker/network/unit/Dockerfile.alma-9 +++ b/docker/network/unit/Dockerfile.alma-9 @@ -1,7 +1,7 @@ # SPDX-FileCopyrightText: Red Hat, Inc. # SPDX-License-Identifier: GPL-2.0-or-later -FROM quay.io/almalinux/almalinux:9.0 +FROM quay.io/almalinuxorg/almalinux:9 # Use legacy cryptopolicy as workaround for https://bugzilla.redhat.com/show_bug.cgi?id=2059101 # until https://pagure.io/copr/copr/issue/2106 is fixed diff --git a/docker/network/unit/Dockerfile.centos-8 b/docker/network/unit/Dockerfile.centos-8 deleted file mode 100644 index bed9992714..0000000000 --- a/docker/network/unit/Dockerfile.centos-8 +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Red Hat, Inc. -# SPDX-License-Identifier: GPL-2.0-or-later - -FROM quay.io/centos/centos:stream8 - -# Add runtime dependencies. -RUN dnf -y install dnf-plugins-core \ - && \ - dnf copr enable -y ovirt/ovirt-master-snapshot centos-stream-8 \ - && \ - dnf install -y ovirt-release-master \ - && \ - dnf update -y \ - && \ - dnf install -y \ - iproute-tc \ - libnl3 \ - nmstate \ - python3-devel \ - python3-libnmstate \ - python3-six \ - python3-pip \ - systemd \ - && \ - dnf clean all - -# Add pytest -RUN python3 -m pip install --upgrade pip \ - && \ - python3 -m pip install pytest - -CMD ["/usr/sbin/init"] diff --git a/tests/network/functional/run-tests.sh b/tests/network/functional/run-tests.sh index d014770143..0718b5edf8 100755 --- a/tests/network/functional/run-tests.sh +++ b/tests/network/functional/run-tests.sh @@ -5,7 +5,7 @@ source tests/network/common.sh -IMAGE_TAG="${IMAGE_TAG:=centos-8}" +IMAGE_TAG="${IMAGE_TAG:=centos-9}" CONTAINER_IMAGE="${CONTAINER_IMAGE:=$IMAGE_PREFIX-functional}" NMSTATE_WORKSPACE="/workspace/nmstate" NMSTATE_TMP="/nmstate-tmp" diff --git a/tests/network/integration/run-tests.sh b/tests/network/integration/run-tests.sh index cc35521c46..52baf91d85 100755 --- a/tests/network/integration/run-tests.sh +++ b/tests/network/integration/run-tests.sh @@ -5,7 +5,7 @@ source tests/network/common.sh -IMAGE_TAG="${IMAGE_TAG:=centos-8}" +IMAGE_TAG="${IMAGE_TAG:=centos-9}" CONTAINER_IMAGE="${CONTAINER_IMAGE:=$IMAGE_PREFIX-integration}" load_kernel_modules diff --git a/tests/network/unit/run-tests.sh b/tests/network/unit/run-tests.sh index 4a8d3920a2..93c9290afc 100755 --- a/tests/network/unit/run-tests.sh +++ b/tests/network/unit/run-tests.sh @@ -5,7 +5,7 @@ source tests/network/common.sh -IMAGE_TAG="${IMAGE_TAG:=centos-8}" +IMAGE_TAG="${IMAGE_TAG:=centos-9}" CONTAINER_IMAGE="${CONTAINER_IMAGE:=$IMAGE_PREFIX-unit}" function patch_dist_commons { diff --git a/tox.ini b/tox.ini index 25d1ffcccd..e0949bf203 100644 --- a/tox.ini +++ b/tox.ini @@ -22,7 +22,6 @@ deps = pytest pytest-cov pytest-timeout - packaging changedir = {toxinidir}/tests markers = "not (integration or slow or stress)" @@ -91,10 +90,10 @@ passenv = {[base]passenv} setenv = {[base]setenv} COVERAGE_FILE=.coverage-storage-user -deps = {[base]deps} - userstorage>=0.5.1 changedir = {[base]changedir} commands = + python -I -m pip install packaging>=22.0 + python -I -m pip install nose==1.3.7 pytest pytest-cov pytest-timeout userstorage>=0.5.1 python profile {envname} pytest -m {[base]markers}" and not root" \ --durations=20 \ --cov=vdsm.storage \ @@ -107,10 +106,10 @@ passenv = {[base]passenv} setenv = {[base]setenv} COVERAGE_FILE=.coverage-storage-root -deps = {[base]deps} - userstorage>=0.5.1 changedir = {[base]changedir} commands = + python -I -m pip install packaging>=22.0 + python -I -m pip install nose==1.3.7 pytest pytest-cov pytest-timeout userstorage>=0.5.1 python profile {envname} pytest -m {[base]markers}" and root" \ --durations=20 \ --cov=vdsm.storage \ @@ -161,9 +160,9 @@ commands = [testenv:pylint] setenv = PYTHONPATH = vdsm:lib -deps = - pylint~=2.10.0 commands = + python -I -m pip install packaging>=22.0 + python -I -m pip install pylint~=2.10.0 python {toxinidir}/tests/profile {envname} pylint -j{env:PYLINT_JOBS:4} --reports=no --score=no {posargs} [testenv:flake8]