diff -Nru osinfo-db-0.20230518/.codespellrc osinfo-db-0.20231027/.codespellrc --- osinfo-db-0.20230518/.codespellrc 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/.codespellrc 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,11 @@ +[codespell] +# ignore +# - the git directory; apparently codespell does not do it) +# - po translations, as they contain non-english texts +# - generated xml files, as they contain translations, +# and they are not the sources anyway +skip = ./.git,*.po,*.xml +# - "medias" is the used lingo for the plural of one "media", +# which is used in libosinfo instead of "medium" +# - "hda" is a disk drive +ignore-words-list = medias,hda diff -Nru osinfo-db-0.20230518/.gitignore osinfo-db-0.20231027/.gitignore --- osinfo-db-0.20230518/.gitignore 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/.gitignore 2023-10-28 18:58:01.000000000 +0000 @@ -2,6 +2,8 @@ data/**/*.xml data/**/*.rng install/ +public/ rpmbuild/ *.spec *.tar.xz +*~ diff -Nru osinfo-db-0.20230518/.gitlab-ci.yml osinfo-db-0.20231027/.gitlab-ci.yml --- osinfo-db-0.20230518/.gitlab-ci.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/.gitlab-ci.yml 2023-10-28 18:58:01.000000000 +0000 @@ -64,4 +64,64 @@ - .native_build_job - .gitlab_native_build_job_local_env +.publish_job: + before_script: + script: + - apt update && apt install -y osinfo-db-tools + - make V=1 ARCHIVE=osinfo-db-latest.tar.xz + artifacts: + expire_in: 1 day + paths: + - osinfo-db-latest.tar.xz + +# Going against our usual naming convention for jobs using prebuilt containers +# here as we'll be consuming the job artifacts via a direct URL which includes +# the GitLab job name, so let's go with a more convenient name +publish: + extends: + - .publish_job + - .gitlab_native_build_job_prebuilt_env + needs: + - job: x86_64-debian-12-container + optional: true + variables: + NAME: debian-12 + +publish-local-env: + extends: + - .publish_job + - .gitlab_native_build_job_local_env + variables: + IMAGE: docker.io/library/debian:12-slim + NAME: debian-12 + +.web: + image: docker.io/library/python:3.9-alpine + stage: builds + before_script: + - apk add git gpg gpg-agent + script: + - ./scripts/osinfo-db-web.py + artifacts: + paths: + - public/ + +# This job creates artifacts which can be browsed without making live +web: + extends: .web + rules: + # Only run if it is a merge request, or a forced pipeline + - if: '$CI_PIPELINE_SOURCE == "merge_request_event" || $RUN_PIPELINE == "1"' + when: on_success + - when: never + +# This job creates artifacts and publishes them to the live site +pages: + extends: .web + rules: + # We can publish the website from pushes to the main branch only + - if: '$CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + when: on_success + - when: never + include: '/ci/gitlab.yml' diff -Nru osinfo-db-0.20230518/README osinfo-db-0.20231027/README --- osinfo-db-0.20230518/README 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/README 2023-10-28 18:58:01.000000000 +0000 @@ -26,7 +26,7 @@ Build reproducibility ===================== -To build libosinfo reproduciblity, you should export the SOURCE_DATE_EPOCH[0] +To build libosinfo reproducibly, you should export the SOURCE_DATE_EPOCH[0] environment variable to the build system. For example: $ export SOURCE_DATE_EPOCH="$(date +%s)" diff -Nru osinfo-db-0.20230518/ci/buildenv/debian-10.sh osinfo-db-0.20231027/ci/buildenv/debian-10.sh --- osinfo-db-0.20230518/ci/buildenv/debian-10.sh 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/debian-10.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - xz-utils - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install meson==0.56.0 -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/debian-12.sh osinfo-db-0.20231027/ci/buildenv/debian-12.sh --- osinfo-db-0.20230518/ci/buildenv/debian-12.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/debian-12.sh 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,45 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get dist-upgrade -y + apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen + dpkg-reconfigure locales + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/fedora-35.sh osinfo-db-0.20231027/ci/buildenv/fedora-35.sh --- osinfo-db-0.20230518/ci/buildenv/fedora-35.sh 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/fedora-35.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - dnf update -y - dnf install -y \ - ca-certificates \ - ccache \ - cppi \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz - rpm -qa | sort > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/fedora-36.sh osinfo-db-0.20231027/ci/buildenv/fedora-36.sh --- osinfo-db-0.20230518/ci/buildenv/fedora-36.sh 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/fedora-36.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - dnf update -y - dnf install -y \ - ca-certificates \ - ccache \ - cppi \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz - rpm -qa | sort > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/fedora-37.sh osinfo-db-0.20231027/ci/buildenv/fedora-37.sh --- osinfo-db-0.20230518/ci/buildenv/fedora-37.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/fedora-37.sh 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,43 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + dnf update -y + dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + rpm -qa | sort > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/fedora-38.sh osinfo-db-0.20231027/ci/buildenv/fedora-38.sh --- osinfo-db-0.20230518/ci/buildenv/fedora-38.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/fedora-38.sh 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,43 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + dnf update -y + dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + rpm -qa | sort > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/opensuse-leap-15.sh osinfo-db-0.20231027/ci/buildenv/opensuse-leap-15.sh --- osinfo-db-0.20230518/ci/buildenv/opensuse-leap-15.sh 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/opensuse-leap-15.sh 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,43 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +function install_buildenv() { + zypper update -y + zypper install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext-runtime \ + git \ + glib2-devel \ + glibc-locale \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja \ + pkgconfig \ + python3-base \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz + rpm -qa | sort > /packages.txt + mkdir -p /usr/libexec/ccache-wrappers + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc +} + +export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" +export LANG="en_US.UTF-8" +export MAKE="/usr/bin/make" +export NINJA="/usr/bin/ninja" +export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/opensuse-leap-153.sh osinfo-db-0.20231027/ci/buildenv/opensuse-leap-153.sh --- osinfo-db-0.20230518/ci/buildenv/opensuse-leap-153.sh 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/opensuse-leap-153.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,46 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - zypper update -y - zypper install -y \ - ca-certificates \ - ccache \ - cppi \ - gcc \ - gettext-runtime \ - git \ - glib2-devel \ - glibc-locale \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - ninja \ - pkgconfig \ - python3-base \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - rpm-build \ - xz - rpm -qa | sort > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install meson==0.56.0 -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/buildenv/ubuntu-1804.sh osinfo-db-0.20231027/ci/buildenv/ubuntu-1804.sh --- osinfo-db-0.20230518/ci/buildenv/ubuntu-1804.sh 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/buildenv/ubuntu-1804.sh 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -function install_buildenv() { - export DEBIAN_FRONTEND=noninteractive - apt-get update - apt-get dist-upgrade -y - apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - xz-utils - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen - dpkg-reconfigure locales - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt - mkdir -p /usr/libexec/ccache-wrappers - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - /usr/bin/pip3 install meson==0.56.0 -} - -export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers" -export LANG="en_US.UTF-8" -export MAKE="/usr/bin/make" -export NINJA="/usr/bin/ninja" -export PYTHON="/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/debian-10.Dockerfile osinfo-db-0.20231027/ci/containers/debian-10.Dockerfile --- osinfo-db-0.20230518/ci/containers/debian-10.Dockerfile 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/debian-10.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/debian:10-slim - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - xz-utils && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -RUN /usr/bin/pip3 install meson==0.56.0 - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/debian-12.Dockerfile osinfo-db-0.20231027/ci/containers/debian-12.Dockerfile --- osinfo-db-0.20230518/ci/containers/debian-12.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/debian-12.Dockerfile 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,48 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM docker.io/library/debian:12-slim + +RUN export DEBIAN_FRONTEND=noninteractive && \ + apt-get update && \ + apt-get install -y eatmydata && \ + eatmydata apt-get dist-upgrade -y && \ + eatmydata apt-get install --no-install-recommends -y \ + ca-certificates \ + ccache \ + gcc \ + gettext \ + git \ + libarchive-dev \ + libglib2.0-dev \ + libjson-glib-dev \ + libsoup2.4-dev \ + libxml2-dev \ + libxslt1-dev \ + locales \ + make \ + meson \ + ninja-build \ + pkgconf \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + xz-utils && \ + eatmydata apt-get autoremove -y && \ + eatmydata apt-get autoclean -y && \ + sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ + dpkg-reconfigure locales && \ + dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/fedora-35.Dockerfile osinfo-db-0.20231027/ci/containers/fedora-35.Dockerfile --- osinfo-db-0.20230518/ci/containers/fedora-35.Dockerfile 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/fedora-35.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.fedoraproject.org/fedora:35 - -RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ -if test -d /usr/lib64\n\ -then\n\ - export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ -else\n\ - export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ -fi\n\ -exec "$@"' > /usr/bin/nosync && \ - chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ - nosync dnf install -y \ - ca-certificates \ - ccache \ - cppi \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz && \ - nosync dnf autoremove -y && \ - nosync dnf clean all -y && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/fedora-36.Dockerfile osinfo-db-0.20231027/ci/containers/fedora-36.Dockerfile --- osinfo-db-0.20230518/ci/containers/fedora-36.Dockerfile 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/fedora-36.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.fedoraproject.org/fedora:36 - -RUN dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ -if test -d /usr/lib64\n\ -then\n\ - export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ -else\n\ - export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ -fi\n\ -exec "$@"' > /usr/bin/nosync && \ - chmod +x /usr/bin/nosync && \ - nosync dnf update -y && \ - nosync dnf install -y \ - ca-certificates \ - ccache \ - cppi \ - gcc \ - gettext \ - git \ - glib2-devel \ - glibc-langpack-en \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - meson \ - ninja-build \ - pkgconfig \ - python3 \ - python3-lxml \ - python3-pytest \ - python3-requests \ - rpm-build \ - xz && \ - nosync dnf autoremove -y && \ - nosync dnf clean all -y && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/fedora-37.Dockerfile osinfo-db-0.20231027/ci/containers/fedora-37.Dockerfile --- osinfo-db-0.20230518/ci/containers/fedora-37.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/fedora-37.Dockerfile 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,55 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.fedoraproject.org/fedora:37 + +RUN dnf install -y nosync && \ + printf '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"\n' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/fedora-38.Dockerfile osinfo-db-0.20231027/ci/containers/fedora-38.Dockerfile --- osinfo-db-0.20230518/ci/containers/fedora-38.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/fedora-38.Dockerfile 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,55 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.fedoraproject.org/fedora:38 + +RUN dnf install -y nosync && \ + printf '#!/bin/sh\n\ +if test -d /usr/lib64\n\ +then\n\ + export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ +else\n\ + export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ +fi\n\ +exec "$@"\n' > /usr/bin/nosync && \ + chmod +x /usr/bin/nosync && \ + nosync dnf update -y && \ + nosync dnf install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext \ + git \ + glib2-devel \ + glibc-langpack-en \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja-build \ + pkgconfig \ + python3 \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz && \ + nosync dnf autoremove -y && \ + nosync dnf clean all -y && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/fedora-rawhide.Dockerfile osinfo-db-0.20231027/ci/containers/fedora-rawhide.Dockerfile --- osinfo-db-0.20230518/ci/containers/fedora-rawhide.Dockerfile 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/fedora-rawhide.Dockerfile 2023-10-28 18:58:01.000000000 +0000 @@ -8,14 +8,14 @@ RUN dnf update -y --nogpgcheck fedora-gpg-keys && \ dnf install -y nosync && \ - echo -e '#!/bin/sh\n\ + printf '#!/bin/sh\n\ if test -d /usr/lib64\n\ then\n\ export LD_PRELOAD=/usr/lib64/nosync/nosync.so\n\ else\n\ export LD_PRELOAD=/usr/lib/nosync/nosync.so\n\ fi\n\ -exec "$@"' > /usr/bin/nosync && \ +exec "$@"\n' > /usr/bin/nosync && \ chmod +x /usr/bin/nosync && \ nosync dnf distro-sync -y && \ nosync dnf install -y \ diff -Nru osinfo-db-0.20230518/ci/containers/opensuse-leap-15.Dockerfile osinfo-db-0.20231027/ci/containers/opensuse-leap-15.Dockerfile --- osinfo-db-0.20230518/ci/containers/opensuse-leap-15.Dockerfile 1970-01-01 00:00:00.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/opensuse-leap-15.Dockerfile 2023-10-28 18:58:01.000000000 +0000 @@ -0,0 +1,44 @@ +# THIS FILE WAS AUTO-GENERATED +# +# $ lcitool manifest ci/manifest.yml +# +# https://gitlab.com/libvirt/libvirt-ci + +FROM registry.opensuse.org/opensuse/leap:15.5 + +RUN zypper update -y && \ + zypper install -y \ + ca-certificates \ + ccache \ + cppi \ + gcc \ + gettext-runtime \ + git \ + glib2-devel \ + glibc-locale \ + json-glib-devel \ + libarchive-devel \ + libsoup-devel \ + libxml2-devel \ + libxslt-devel \ + make \ + meson \ + ninja \ + pkgconfig \ + python3-base \ + python3-lxml \ + python3-pytest \ + python3-requests \ + rpm-build \ + xz && \ + zypper clean --all && \ + rpm -qa | sort > /packages.txt && \ + mkdir -p /usr/libexec/ccache-wrappers && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ + ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc + +ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" +ENV LANG "en_US.UTF-8" +ENV MAKE "/usr/bin/make" +ENV NINJA "/usr/bin/ninja" +ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/opensuse-leap-153.Dockerfile osinfo-db-0.20231027/ci/containers/opensuse-leap-153.Dockerfile --- osinfo-db-0.20230518/ci/containers/opensuse-leap-153.Dockerfile 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/opensuse-leap-153.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,48 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM registry.opensuse.org/opensuse/leap:15.3 - -RUN zypper update -y && \ - zypper install -y \ - ca-certificates \ - ccache \ - cppi \ - gcc \ - gettext-runtime \ - git \ - glib2-devel \ - glibc-locale \ - json-glib-devel \ - libarchive-devel \ - libsoup-devel \ - libxml2-devel \ - libxslt-devel \ - make \ - ninja \ - pkgconfig \ - python3-base \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - rpm-build \ - xz && \ - zypper clean --all && \ - rpm -qa | sort > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -RUN /usr/bin/pip3 install meson==0.56.0 - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/containers/ubuntu-1804.Dockerfile osinfo-db-0.20231027/ci/containers/ubuntu-1804.Dockerfile --- osinfo-db-0.20230518/ci/containers/ubuntu-1804.Dockerfile 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/containers/ubuntu-1804.Dockerfile 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -# THIS FILE WAS AUTO-GENERATED -# -# $ lcitool manifest ci/manifest.yml -# -# https://gitlab.com/libvirt/libvirt-ci - -FROM docker.io/library/ubuntu:18.04 - -RUN export DEBIAN_FRONTEND=noninteractive && \ - apt-get update && \ - apt-get install -y eatmydata && \ - eatmydata apt-get dist-upgrade -y && \ - eatmydata apt-get install --no-install-recommends -y \ - ca-certificates \ - ccache \ - gcc \ - gettext \ - git \ - libarchive-dev \ - libglib2.0-dev \ - libjson-glib-dev \ - libsoup2.4-dev \ - libxml2-dev \ - libxslt1-dev \ - locales \ - make \ - ninja-build \ - pkgconf \ - python3 \ - python3-lxml \ - python3-pip \ - python3-pytest \ - python3-requests \ - python3-setuptools \ - python3-wheel \ - xz-utils && \ - eatmydata apt-get autoremove -y && \ - eatmydata apt-get autoclean -y && \ - sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \ - dpkg-reconfigure locales && \ - dpkg-query --showformat '${Package}_${Version}_${Architecture}\n' --show > /packages.txt && \ - mkdir -p /usr/libexec/ccache-wrappers && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \ - ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc - -RUN /usr/bin/pip3 install meson==0.56.0 - -ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers" -ENV LANG "en_US.UTF-8" -ENV MAKE "/usr/bin/make" -ENV NINJA "/usr/bin/ninja" -ENV PYTHON "/usr/bin/python3" diff -Nru osinfo-db-0.20230518/ci/gitlab/build-templates.yml osinfo-db-0.20231027/ci/gitlab/build-templates.yml --- osinfo-db-0.20230518/ci/gitlab/build-templates.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/gitlab/build-templates.yml 2023-10-28 18:58:01.000000000 +0000 @@ -9,14 +9,14 @@ # We use pre-built containers for any pipelines that are: # # - Validating code committed on default upstream branch -# - Validating patches targetting default upstream branch +# - Validating patches targeting default upstream branch # which do not have CI changes # # We use a local build env for any pipelines that are: # # - Validating code committed to a non-default upstream branch -# - Validating patches targetting a non-default upstream branch -# - Validating patches targetting default upstream branch which +# - Validating patches targeting a non-default upstream branch +# - Validating patches targeting default upstream branch which # include CI changes # - Validating code committed to a fork branch # @@ -26,6 +26,7 @@ .gitlab_native_build_job_prebuilt_env: image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/osinfo-db/ci-$NAME:latest stage: builds + interruptible: true before_script: - cat /packages.txt rules: @@ -36,14 +37,21 @@ - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' when: on_success - # upstream: other web/api/scheduled pipelines targetting the default branch + # forks: pushes to a branch when a pipeline run in upstream env is explicitly requested + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV && $JOB_OPTIONAL' + when: manual + allow_failure: true + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV' + when: on_success + + # upstream: other web/api/scheduled pipelines targeting the default branch - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH' when: on_success - # upstream+forks: merge requests targetting the default branch, without CI changes + # upstream+forks: merge requests targeting the default branch, without CI changes - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml @@ -61,6 +69,7 @@ .gitlab_native_build_job_local_env: image: $IMAGE stage: builds + interruptible: true before_script: - source ci/buildenv/$NAME.sh - install_buildenv @@ -73,13 +82,18 @@ - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH' when: on_success + # forks: avoid build in local env when job requests run in upstream containers + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE_UPSTREAM_ENV' + when: never + + # forks: pushes to branches with pipeline requested - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE && $JOB_OPTIONAL' when: manual allow_failure: true - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE' when: on_success - # upstream: other web/api/scheduled pipelines targetting non-default branches + # upstream: other web/api/scheduled pipelines targeting non-default branches - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true @@ -93,7 +107,7 @@ - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/' when: on_success - # upstream+forks: merge requests targetting the default branch, with CI changes + # upstream+forks: merge requests targeting the default branch, with CI changes - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' changes: - ci/gitlab/container-templates.yml @@ -106,7 +120,7 @@ - ci/containers/$NAME.Dockerfile when: on_success - # upstream+forks: merge requests targetting non-default branches + # upstream+forks: merge requests targeting non-default branches - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual allow_failure: true diff -Nru osinfo-db-0.20230518/ci/gitlab/builds.yml osinfo-db-0.20231027/ci/gitlab/builds.yml --- osinfo-db-0.20230518/ci/gitlab/builds.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/gitlab/builds.yml 2023-10-28 18:58:01.000000000 +0000 @@ -43,40 +43,40 @@ NAME: centos-stream-9 -x86_64-debian-10-prebuilt-env: +x86_64-debian-11-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-debian-10-container + - job: x86_64-debian-11-container optional: true allow_failure: false variables: - NAME: debian-10 + NAME: debian-11 -x86_64-debian-10-local-env: +x86_64-debian-11-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: docker.io/library/debian:10-slim - NAME: debian-10 + IMAGE: docker.io/library/debian:11-slim + NAME: debian-11 -x86_64-debian-11-prebuilt-env: +x86_64-debian-12-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-debian-11-container + - job: x86_64-debian-12-container optional: true allow_failure: false variables: - NAME: debian-11 + NAME: debian-12 -x86_64-debian-11-local-env: +x86_64-debian-12-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: docker.io/library/debian:11-slim - NAME: debian-11 + IMAGE: docker.io/library/debian:12-slim + NAME: debian-12 x86_64-debian-sid-prebuilt-env: @@ -97,40 +97,40 @@ NAME: debian-sid -x86_64-fedora-35-prebuilt-env: +x86_64-fedora-37-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-fedora-35-container + - job: x86_64-fedora-37-container optional: true allow_failure: false variables: - NAME: fedora-35 + NAME: fedora-37 -x86_64-fedora-35-local-env: +x86_64-fedora-37-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: registry.fedoraproject.org/fedora:35 - NAME: fedora-35 + IMAGE: registry.fedoraproject.org/fedora:37 + NAME: fedora-37 -x86_64-fedora-36-prebuilt-env: +x86_64-fedora-38-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-fedora-36-container + - job: x86_64-fedora-38-container optional: true allow_failure: false variables: - NAME: fedora-36 + NAME: fedora-38 -x86_64-fedora-36-local-env: +x86_64-fedora-38-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: registry.fedoraproject.org/fedora:36 - NAME: fedora-36 + IMAGE: registry.fedoraproject.org/fedora:38 + NAME: fedora-38 x86_64-fedora-rawhide-prebuilt-env: @@ -151,22 +151,22 @@ NAME: fedora-rawhide -x86_64-opensuse-leap-153-prebuilt-env: +x86_64-opensuse-leap-15-prebuilt-env: extends: .native_build_job_prebuilt_env needs: - - job: x86_64-opensuse-leap-153-container + - job: x86_64-opensuse-leap-15-container optional: true allow_failure: false variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-15 -x86_64-opensuse-leap-153-local-env: +x86_64-opensuse-leap-15-local-env: extends: .native_build_job_local_env needs: [] allow_failure: false variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.3 - NAME: opensuse-leap-153 + IMAGE: registry.opensuse.org/opensuse/leap:15.5 + NAME: opensuse-leap-15 x86_64-opensuse-tumbleweed-prebuilt-env: @@ -187,24 +187,6 @@ NAME: opensuse-tumbleweed -x86_64-ubuntu-1804-prebuilt-env: - extends: .native_build_job_prebuilt_env - needs: - - job: x86_64-ubuntu-1804-container - optional: true - allow_failure: false - variables: - NAME: ubuntu-1804 - -x86_64-ubuntu-1804-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/ubuntu:18.04 - NAME: ubuntu-1804 - - x86_64-ubuntu-2004-prebuilt-env: extends: .native_build_job_prebuilt_env needs: diff -Nru osinfo-db-0.20230518/ci/gitlab/container-templates.yml osinfo-db-0.20231027/ci/gitlab/container-templates.yml --- osinfo-db-0.20230518/ci/gitlab/container-templates.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/gitlab/container-templates.yml 2023-10-28 18:58:01.000000000 +0000 @@ -14,8 +14,9 @@ # Note: never publish from merge requests since they have non-committed code # .container_job: - image: docker:stable + image: docker:latest stage: containers + interruptible: false needs: [] services: - docker:dind diff -Nru osinfo-db-0.20230518/ci/gitlab/containers.yml osinfo-db-0.20231027/ci/gitlab/containers.yml --- osinfo-db-0.20230518/ci/gitlab/containers.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/gitlab/containers.yml 2023-10-28 18:58:01.000000000 +0000 @@ -21,18 +21,18 @@ NAME: centos-stream-9 -x86_64-debian-10-container: +x86_64-debian-11-container: extends: .container_job allow_failure: false variables: - NAME: debian-10 + NAME: debian-11 -x86_64-debian-11-container: +x86_64-debian-12-container: extends: .container_job allow_failure: false variables: - NAME: debian-11 + NAME: debian-12 x86_64-debian-sid-container: @@ -42,18 +42,18 @@ NAME: debian-sid -x86_64-fedora-35-container: +x86_64-fedora-37-container: extends: .container_job allow_failure: false variables: - NAME: fedora-35 + NAME: fedora-37 -x86_64-fedora-36-container: +x86_64-fedora-38-container: extends: .container_job allow_failure: false variables: - NAME: fedora-36 + NAME: fedora-38 x86_64-fedora-rawhide-container: @@ -63,11 +63,11 @@ NAME: fedora-rawhide -x86_64-opensuse-leap-153-container: +x86_64-opensuse-leap-15-container: extends: .container_job allow_failure: false variables: - NAME: opensuse-leap-153 + NAME: opensuse-leap-15 x86_64-opensuse-tumbleweed-container: @@ -77,13 +77,6 @@ NAME: opensuse-tumbleweed -x86_64-ubuntu-1804-container: - extends: .container_job - allow_failure: false - variables: - NAME: ubuntu-1804 - - x86_64-ubuntu-2004-container: extends: .container_job allow_failure: false diff -Nru osinfo-db-0.20230518/ci/gitlab/sanity-checks.yml osinfo-db-0.20231027/ci/gitlab/sanity-checks.yml --- osinfo-db-0.20230518/ci/gitlab/sanity-checks.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/gitlab/sanity-checks.yml 2023-10-28 18:58:01.000000000 +0000 @@ -8,7 +8,8 @@ check-dco: stage: sanity_checks needs: [] - image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:master + image: registry.gitlab.com/libvirt/libvirt-ci/check-dco:latest + interruptible: true script: - /check-dco "$RUN_UPSTREAM_NAMESPACE" rules: @@ -16,11 +17,54 @@ - if: '$CI_PIPELINE_SOURCE =~ "merge_request_event"' when: on_success - # forks: pushes to branches with pipeline requested + # forks: pushes to branches with pipeline requested (including upstream env pipelines) - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE' when: on_success + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV' + when: on_success # upstream+forks: that's all folks - when: never variables: GIT_DEPTH: 1000 + + +.code_format: + stage: sanity_checks + image: registry.gitlab.com/libvirt/libvirt-ci/$NAME:latest + interruptible: true + needs: [] + script: + - /$NAME + rules: + # upstream+forks: Run pipelines on MR, web, api & scheduled + - if: '$CI_PIPELINE_SOURCE =~ /(web|api|schedule|merge_request_event)/' + when: on_success + + # forks: pushes to branches with pipeline requested (including upstream env pipelines) + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE' + when: on_success + - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH && $RUN_PIPELINE_UPSTREAM_ENV' + when: on_success + + # upstream+forks: that's all folks + - when: never + artifacts: + paths: + - $NAME.$EXT + expire_in: 1 week + when: on_failure + + +black: + extends: .code_format + variables: + EXT: txt + NAME: black + + +flake8: + extends: .code_format + variables: + EXT: txt + NAME: flake8 diff -Nru osinfo-db-0.20230518/ci/gitlab.yml osinfo-db-0.20231027/ci/gitlab.yml --- osinfo-db-0.20230518/ci/gitlab.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/gitlab.yml 2023-10-28 18:58:01.000000000 +0000 @@ -14,6 +14,12 @@ # created/updated. Setting this variable to a non-empty # value allows CI testing prior to opening a merge request. # +# - RUN_PIPELINE_UPSTREAM_ENV - same semantics as RUN_PIPELINE, +# but uses the CI environment (containers) from the upstream project +# rather than creating and updating a throwaway environment +# Should not be used if the pushed branch includes CI container +# changes. +# # - RUN_CONTAINER_BUILDS - CI pipelines in upstream only # publish containers if CI file changes are detected. # Setting this variable to a non-empty value will force @@ -44,6 +50,7 @@ variables: RUN_UPSTREAM_NAMESPACE: libosinfo + FF_SCRIPT_SECTIONS: 1 workflow: @@ -67,6 +74,7 @@ debug: image: docker.io/library/alpine:3 stage: sanity_checks + interruptible: true needs: [] script: - printenv | sort diff -Nru osinfo-db-0.20230518/ci/manifest.yml osinfo-db-0.20231027/ci/manifest.yml --- osinfo-db-0.20230518/ci/manifest.yml 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/ci/manifest.yml 2023-10-28 18:58:01.000000000 +0000 @@ -6,29 +6,31 @@ namespace: libosinfo project: osinfo-db + jobs: + black: true + flake8: true + targets: centos-stream-8: x86_64 centos-stream-9: x86_64 - debian-10: x86_64 - debian-11: x86_64 + debian-12: x86_64 + debian-sid: x86_64 - fedora-35: x86_64 + fedora-37: x86_64 - fedora-36: x86_64 + fedora-38: x86_64 fedora-rawhide: x86_64 - opensuse-leap-153: x86_64 + opensuse-leap-15: x86_64 opensuse-tumbleweed: x86_64 - ubuntu-1804: x86_64 - ubuntu-2004: x86_64 ubuntu-2204: x86_64 diff -Nru osinfo-db-0.20230518/data/install-script/debian.org/debian-preseed-desktop.xml.in osinfo-db-0.20231027/data/install-script/debian.org/debian-preseed-desktop.xml.in --- osinfo-db-0.20230518/data/install-script/debian.org/debian-preseed-desktop.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/install-script/debian.org/debian-preseed-desktop.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -65,7 +65,7 @@ - locahost + localhost diff -Nru osinfo-db-0.20230518/data/install-script/debian.org/debian-preseed-jeos.xml.in osinfo-db-0.20231027/data/install-script/debian.org/debian-preseed-jeos.xml.in --- osinfo-db-0.20230518/data/install-script/debian.org/debian-preseed-jeos.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/install-script/debian.org/debian-preseed-jeos.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -79,7 +79,7 @@ - locahost + localhost diff -Nru osinfo-db-0.20230518/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in osinfo-db-0.20231027/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in --- osinfo-db-0.20230518/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/install-script/fedoraproject.org/fedora-kickstart-jeos.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -32,7 +32,7 @@ - locahost + localhost diff -Nru osinfo-db-0.20230518/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in osinfo-db-0.20231027/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in --- osinfo-db-0.20230518/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/install-script/redhat.com/rhel-kickstart-jeos.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -32,7 +32,7 @@ - locahost + localhost diff -Nru osinfo-db-0.20230518/data/os/altlinux.org/alt-9.1.xml.in osinfo-db-0.20231027/data/os/altlinux.org/alt-9.1.xml.in --- osinfo-db-0.20230518/data/os/altlinux.org/alt-9.1.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/altlinux.org/alt-9.1.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -150,8 +150,8 @@ ALT Server-V 9\.1(\.\d+)* aarch64 BASEALT LTD - alt0/vmlinuz - alt0/full.cz + EFI/BOOT/vmlinuz + EFI/BOOT/full.cz @@ -162,8 +162,8 @@ ALT Server-V 9\.1(\.\d+)* ppc64le BaseALT Ltd - alt0/vmlinuz - alt0/full.cz + boot/vmlinuz + boot/full.cz diff -Nru osinfo-db-0.20230518/data/os/altlinux.org/alt-9.2.xml.in osinfo-db-0.20231027/data/os/altlinux.org/alt-9.2.xml.in --- osinfo-db-0.20230518/data/os/altlinux.org/alt-9.2.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/altlinux.org/alt-9.2.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -112,8 +112,8 @@ ALT Server 9\.2(\.\d+)* aarch64 BASEALT LTD - EFI/BOOT/vmlinuz - EFI/BOOT/full.cz + boot/vmlinuz + boot/full.cz @@ -136,8 +136,8 @@ ALT Server 9\.2(\.\d+)* x86_64 BASEALT LTD - syslinux/alt0/vmlinuz - syslinux/alt0/full.cz + boot/vmlinuz + boot/full.cz @@ -149,8 +149,8 @@ ALT Server-V 9\.2(\.\d+)* aarch64 BASEALT LTD - alt0/vmlinuz - alt0/full.cz + boot/vmlinuz + boot/full.cz @@ -161,8 +161,8 @@ ALT Server-V 9\.2(\.\d+)* ppc64le BASEALT LTD - alt0/vmlinuz - alt0/full.cz + boot/vmlinuz + boot/full.cz @@ -173,8 +173,8 @@ ALT Server-V 9\.2(\.\d+)* x86_64 BASEALT LTD - syslinux/alt0/vmlinuz - syslinux/alt0/full.cz + boot/vmlinuz + boot/full.cz @@ -186,8 +186,8 @@ ALT Education 9\.2(\.\d+)* aarch64 BASEALT LTD - boot/vmlinuz - boot/full.cz + EFI/BOOT/vmlinuz + EFI/BOOT/full.cz diff -Nru osinfo-db-0.20230518/data/os/altlinux.org/altlinux-4.1.xml.in osinfo-db-0.20231027/data/os/altlinux.org/altlinux-4.1.xml.in --- osinfo-db-0.20230518/data/os/altlinux.org/altlinux-4.1.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/altlinux.org/altlinux-4.1.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -20,8 +20,8 @@ ^"Desktop"$ "ALT Linux Team" - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz http://ftp.altlinux.org/pub/distributions/ALTLinux/4.1/Desktop/current/iso/altlinux-4.1.1-desktop-x86_64-install-dvd5.iso @@ -29,8 +29,8 @@ ^"Desktop"$ "ALT Linux Team" - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz diff -Nru osinfo-db-0.20230518/data/os/altlinux.org/altlinux-5.0.xml.in osinfo-db-0.20231027/data/os/altlinux.org/altlinux-5.0.xml.in --- osinfo-db-0.20230518/data/os/altlinux.org/altlinux-5.0.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/altlinux.org/altlinux-5.0.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -31,8 +31,8 @@ ALT Linux 5.0.\d ALT Linux Team - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz http://ftp.altlinux.org/pub/distributions/ALTLinux/p5/iso/ark/altlinux-5.0.0-ark-server-x86_64-ru-install-cd.iso @@ -40,8 +40,8 @@ ALT Linux 5.0.\d ALT Linux Team - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz diff -Nru osinfo-db-0.20230518/data/os/altlinux.org/altlinux-6.0.xml.in osinfo-db-0.20231027/data/os/altlinux.org/altlinux-6.0.xml.in --- osinfo-db-0.20230518/data/os/altlinux.org/altlinux-6.0.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/altlinux.org/altlinux-6.0.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -25,8 +25,8 @@ (ALT|Simply) Linux 6.0.\d ALT Linux Team - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz http://ftp.altlinux.org/pub/distributions/ALTLinux/p6/iso/centaurus/altlinux-6.0.0-centaurus-x86_64-ru-install-dvd5.iso @@ -34,8 +34,8 @@ (ALT|Simply) Linux 6.0.\d ALT Linux Team - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz diff -Nru osinfo-db-0.20230518/data/os/altlinux.org/altlinux-7.0.xml.in osinfo-db-0.20231027/data/os/altlinux.org/altlinux-7.0.xml.in --- osinfo-db-0.20230518/data/os/altlinux.org/altlinux-7.0.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/altlinux.org/altlinux-7.0.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -21,8 +21,8 @@ (ALT|Simply) Linux (6.9|7.0).\d ALT LINUX TEAM - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz http://ftp.altlinux.org/pub/distributions/ALTLinux/p7/images/centaurus/altlinux-7.0.5-centaurus-x86_64-ru-install-dvd5.iso @@ -30,8 +30,8 @@ (ALT|Simply) Linux (6.9|7.0).\d ALT LINUX TEAM - isolinux/alt0/vmlinuz - isolinux/alt0/full.cz + syslinux/alt0/vmlinuz + syslinux/alt0/full.cz diff -Nru osinfo-db-0.20230518/data/os/centos.org/centos-8.xml.in osinfo-db-0.20231027/data/os/centos.org/centos-8.xml.in --- osinfo-db-0.20230518/data/os/centos.org/centos-8.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/centos.org/centos-8.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -50,8 +50,8 @@ CentOS-8-5-2111-aarch64-dvd 745474048 - IMAGES/PXEBOOT/VMLINUZ - IMAGES/PXEBOOT/INITRD.IMG + images/pxeboot/vmlinuz + images/pxeboot/initrd.img diff -Nru osinfo-db-0.20230518/data/os/centos.org/centos-stream-8.xml.in osinfo-db-0.20231027/data/os/centos.org/centos-stream-8.xml.in --- osinfo-db-0.20230518/data/os/centos.org/centos-stream-8.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/centos.org/centos-stream-8.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -390,15 +390,15 @@ - https://cloud.centos.org/centos/8-stream/aarch64/images/CentOS-Stream-GenericCloud-8-20230501.0.aarch64.qcow2 + https://cloud.centos.org/centos/8-stream/aarch64/images/CentOS-Stream-GenericCloud-8-latest.aarch64.qcow2 - https://cloud.centos.org/centos/8-stream/ppc64le/images/CentOS-Stream-GenericCloud-8-20230501.0.ppc64le.qcow2 + https://cloud.centos.org/centos/8-stream/ppc64le/images/CentOS-Stream-GenericCloud-8-latest.ppc64le.qcow2 - https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20230501.0.x86_64.qcow2 + https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-latest.x86_64.qcow2 diff -Nru osinfo-db-0.20230518/data/os/centos.org/centos-stream-9.xml.in osinfo-db-0.20231027/data/os/centos.org/centos-stream-9.xml.in --- osinfo-db-0.20230518/data/os/centos.org/centos-stream-9.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/centos.org/centos-stream-9.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -166,19 +166,19 @@ - https://cloud.centos.org/centos/9-stream/aarch64/images/CentOS-Stream-GenericCloud-9-20230508.0.aarch64.qcow2 + https://cloud.centos.org/centos/9-stream/aarch64/images/CentOS-Stream-GenericCloud-9-latest.aarch64.qcow2 - https://cloud.centos.org/centos/9-stream/ppc64le/images/CentOS-Stream-GenericCloud-9-20230508.0.ppc64le.qcow2 + https://cloud.centos.org/centos/9-stream/ppc64le/images/CentOS-Stream-GenericCloud-9-latest.ppc64le.qcow2 - https://cloud.centos.org/centos/9-stream/s390x/images/CentOS-Stream-GenericCloud-9-20230508.0.s390x.qcow2 + https://cloud.centos.org/centos/9-stream/s390x/images/CentOS-Stream-GenericCloud-9-latest.s390x.qcow2 - https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-20230508.0.x86_64.qcow2 + https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2 diff -Nru osinfo-db-0.20230518/data/os/debian.org/debian-10.xml.in osinfo-db-0.20231027/data/os/debian.org/debian-10.xml.in --- osinfo-db-0.20230518/data/os/debian.org/debian-10.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/debian.org/debian-10.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -19,12 +19,12 @@ 1000000000 1 - 1073741824 + 536870912 10737418240 1000000000 - 1073741824 + 2147483648 21474836480 @@ -83,8 +83,8 @@ Debian 10.\d+.\d+ armhf n - install.armhf/vmlinuz - install.armhf/initrd.gz + install.ahf/vmlinuz + install.ahf/initrd.gz @@ -139,8 +139,8 @@ Debian 10.\d+.\d+ armhf \d+ - install.armhf/vmlinuz - install.armhf/initrd.gz + install.ahf/vmlinuz + install.ahf/initrd.gz diff -Nru osinfo-db-0.20230518/data/os/debian.org/debian-11.xml.in osinfo-db-0.20231027/data/os/debian.org/debian-11.xml.in --- osinfo-db-0.20230518/data/os/debian.org/debian-11.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/debian.org/debian-11.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -24,7 +24,7 @@ 1000000000 - 1073741824 + 2147483648 21474836480 @@ -54,7 +54,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/amd64/iso-cd/debian-11.7.0-amd64-netinst.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/amd64/iso-cd/debian-11.7.0-amd64-netinst.iso Debian 11.\d+.\d+ amd64 n @@ -63,7 +63,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/i386/iso-cd/debian-11.7.0-i386-netinst.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/i386/iso-cd/debian-11.7.0-i386-netinst.iso Debian 11.\d+.\d+ i386 n @@ -72,7 +72,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/arm64/iso-cd/debian-11.7.0-arm64-netinst.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/arm64/iso-cd/debian-11.7.0-arm64-netinst.iso Debian 11.\d+.\d+ arm64 n @@ -81,16 +81,16 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/armhf/iso-cd/debian-11.7.0-armhf-netinst.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/armhf/iso-cd/debian-11.7.0-armhf-netinst.iso Debian 11.\d+.\d+ armhf n - install.armhf/vmlinuz - install.armhf/initrd.gz + install.ahf/vmlinuz + install.ahf/initrd.gz - https://cdimage.debian.org/cdimage/release/11.7.0/ppc64el/iso-cd/debian-11.7.0-ppc64el-netinst.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/ppc64el/iso-cd/debian-11.7.0-ppc64el-netinst.iso Debian 11.\d+.\d+ p64el n @@ -99,7 +99,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/s390x/iso-cd/debian-11.7.0-s390x-netinst.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/s390x/iso-cd/debian-11.7.0-s390x-netinst.iso Debian 11.\d+.\d+ s390x n @@ -110,7 +110,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/amd64/iso-dvd/debian-11.7.0-amd64-DVD-1.iso Debian 11.\d+.\d+ amd64 \d+ @@ -119,7 +119,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/i386/iso-dvd/debian-11.7.0-i386-DVD-1.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/i386/iso-dvd/debian-11.7.0-i386-DVD-1.iso Debian 11.\d+.\d+ i386 \d+ @@ -128,7 +128,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/arm64/iso-dvd/debian-11.7.0-arm64-DVD-1.iso Debian 11.\d+.\d+ arm64 \d+ @@ -137,16 +137,16 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/armhf/iso-dvd/debian-11.7.0-armhf-DVD-1.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/armhf/iso-dvd/debian-11.7.0-armhf-DVD-1.iso Debian 11.\d+.\d+ armhf \d+ - install.armhf/vmlinuz - install.armhf/initrd.gz + install.ahf/vmlinuz + install.ahf/initrd.gz - https://cdimage.debian.org/cdimage/release/11.7.0/ppc64el/iso-dvd/debian-11.7.0-ppc64el-DVD-1.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/ppc64el/iso-dvd/debian-11.7.0-ppc64el-DVD-1.iso Debian 11.\d+.\d+ p64el \d+ @@ -155,7 +155,7 @@ - https://cdimage.debian.org/cdimage/release/11.7.0/s390x/iso-dvd/debian-11.7.0-s390x-DVD-1.iso + https://cdimage.debian.org/mirror/cdimage/archive/11.7.0/s390x/iso-dvd/debian-11.7.0-s390x-DVD-1.iso Debian 11.\d+.\d+ s390x \d+ diff -Nru osinfo-db-0.20230518/data/os/debian.org/debian-12.xml.in osinfo-db-0.20231027/data/os/debian.org/debian-12.xml.in --- osinfo-db-0.20230518/data/os/debian.org/debian-12.xml.in 2023-05-18 12:58:40.000000000 +0000 +++ osinfo-db-0.20231027/data/os/debian.org/debian-12.xml.in 2023-10-28 18:58:01.000000000 +0000 @@ -13,7 +13,21 @@ - prerelease + 2023-06-10 + + + + 1000000000 + 1 + 1073741824 + 10737418240 + + + 1000000000 + 2147483648 + 21474836480 + + Debian 12 @@ -35,6 +49,7 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/amd64/iso-cd/debian-12.2.0-amd64-netinst.iso Debian 12.\d+.\d+ amd64 n @@ -43,6 +58,7 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/i386/iso-cd/debian-12.2.0-i386-netinst.iso Debian 12.\d+.\d+ i386 n @@ -51,21 +67,25 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/arm64/iso-cd/debian-12.2.0-arm64-netinst.iso Debian 12.\d+.\d+ arm64 n install.a64/vmlinuz + install.a64/initrd.gz + https://cdimage.debian.org/cdimage/release/12.2.0/armhf/iso-cd/debian-12.2.0-armhf-netinst.iso Debian 12.\d+.\d+ armhf n - install.armhf/vmlinuz - install.armhf/initrd.gz + install.ahf/vmlinuz + install.ahf/initrd.gz + https://cdimage.debian.org/cdimage/release/12.2.0/ppc64el/iso-cd/debian-12.2.0-ppc64el-netinst.iso Debian 12.\d+.\d+ p64el n @@ -74,6 +94,7 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/s390x/iso-cd/debian-12.2.0-s390x-netinst.iso Debian 12.\d+.\d+ s390x n @@ -84,6 +105,7 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/amd64/iso-dvd/debian-12.2.0-amd64-DVD-1.iso Debian 12.\d+.\d+ amd64 \d+ @@ -92,6 +114,7 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/i386/iso-dvd/debian-12.2.0-i386-DVD-1.iso Debian 12.\d+.\d+ i386 \d+ @@ -100,6 +123,7 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/arm64/iso-dvd/debian-12.2.0-arm64-DVD-1.iso Debian 12.\d+.\d+ arm64 \d+ @@ -108,14 +132,16 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/armhf/iso-dvd/debian-12.2.0-armhf-DVD-1.iso Debian 12.\d+.\d+ armhf \d+ - install.armhf/vmlinuz - install.armhf/initrd.gz + install.ahf/vmlinuz + install.ahf/initrd.gz + https://cdimage.debian.org/cdimage/release/12.2.0/ppc64el/iso-dvd/debian-12.2.0-ppc64el-DVD-1.iso Debian 12.\d+.\d+ p64el \d+ @@ -124,6 +150,7 @@ + https://cdimage.debian.org/cdimage/release/12.2.0/s390x/iso-dvd/debian-12.2.0-s390x-DVD-1.iso Debian 12.\d+.\d+ s390x \d+ @@ -162,6 +189,31 @@ current/images/netboot/debian-installer/ppc64el/initrd.gz + + + https://cdimage.debian.org/cdimage/cloud/bookworm/latest/debian-12-generic-amd64.qcow2 + + + + + https://cdimage.debian.org/cdimage/cloud/bookworm/latest/debian-12-genericcloud-amd64.qcow2 + + + + + https://cdimage.debian.org/cdimage/cloud/bookworm/latest/debian-12-generic-arm64.qcow2 + + + + + https://cdimage.debian.org/cdimage/cloud/bookworm/latest/debian-12-generic-ppc64el.qcow2 + + + + + https://cdimage.debian.org/cdimage/cloud/bookworm/latest/debian-12-nocloud-amd64.qcow2 + +