- Devel - libvirt List Archives

[PATCH v2 0/3] Prepare webpage for hosting via gitlab pages
by Peter Krempa 19 Jan '24

19 Jan '24

Diff to v1: - improve and simplify 'pages' job - fix redirect to 'maven' As the progress on the gitlab feature we need to do this seems good: https://gitlab.com/gitlab-org/gitlab-pages/-/issues/601 this series prepares the libvirt project to do the hosting and will allow us to validate it before switching over once the feature is enabled. Patches 1/3 and 2/3 can be pushed right away: - Patch 1/4 prepares the job to publish the page (currently via the libvirt.gitlab.io/libvirt URL each project gets automatically - Patch 2/4 adds the '_redirects' file which is populated from adapted 'mod_rewrite' rules from the current server. This file serves for validation of the rules and will allow us to validate them before switching over The last patch is needed for the final switchover as the redirects need to be modified slightly to work properly. Peter Krempa (3): gitlab-ci: Configure website build to be published via gitlab pages docs: Add redirects configuration for gitlab pages docs: gitlab redirects: Drop '/libvirt' prefix for hosting the web through gitlab pages .gitlab-ci.yml | 19 +++++++++++++++ .gitlab_pages_redirects | 54 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+) create mode 100644 .gitlab_pages_redirects -- 2.43.0

2 6

[PATCH] ci: Regenerate with latest 'lcitool' and fix manual job definitions
by Peter Krempa 19 Jan '24

19 Jan '24

The latest lcitool merged the 'prebuilt-env' and 'local-env' jobs into one which use variables to pick up the right environment and steps rather than duplicating everything. Regenerate the generated job definitions, fix the helper definitions and also fix the manually defined jobs (website-job). Signed-off-by: Peter Krempa <pkrempa(a)redhat.com> --- .gitlab-ci.yml | 68 +--- ci/gitlab/build-templates.yml | 118 +++--- ci/gitlab/builds.yml | 696 +++++++--------------------------- ci/integration-template.yml | 30 +- ci/integration.yml | 147 ++----- 5 files changed, 253 insertions(+), 806 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8bad761b32..81433652ae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,6 +20,7 @@ include: - '/ci/integration.yml' .native_build_job: + extends: .gitlab_native_build_job cache: paths: - ccache/ @@ -40,17 +41,8 @@ include: mv "$HOME"/rpmbuild/RPMS/x86_64/ libvirt-rpms/; fi -.native_build_job_prebuilt_env: - extends: - - .native_build_job - - .gitlab_native_build_job_prebuilt_env - -.native_build_job_local_env: - extends: - - .native_build_job - - .gitlab_native_build_job_local_env - .cross_build_job: + extends: .gitlab_cross_build_job cache: paths: - ccache/ @@ -68,21 +60,14 @@ include: fi; fi -.cross_build_job_prebuilt_env: - extends: - - .cross_build_job - - .gitlab_cross_build_job_prebuilt_env - -.cross_build_job_local_env: - extends: - - .cross_build_job - - .gitlab_cross_build_job_local_env - - # This artifact published by this job is downloaded by libvirt.org to # be deployed to the web root: # https://gitlab.com/libvirt/libvirt/-/jobs/artifacts/master/download?job=web… -.website_job: +website_job: + extends: .gitlab_native_build_job + needs: + - job: x86_64-almalinux-8-container + optional: true script: - source ci/jobs.sh - run_website_build @@ -96,50 +81,21 @@ include: expire_in: 30 days paths: - website - -website_prebuilt_env: - extends: - - .website_job - - .gitlab_native_build_job_prebuilt_env - needs: - - job: x86_64-almalinux-8-container - optional: true variables: NAME: almalinux-8 - -website_local_env: - extends: - - .website_job - - .gitlab_native_build_job_local_env - variables: - IMAGE: docker.io/library/almalinux:8 - NAME: almalinux-8 - + TARGET_BASE_IMAGE: docker.io/library/almalinux:8 .codestyle_job: stage: sanity_checks - script: - - source ci/jobs.sh - - run_codestyle - -codestyle_prebuilt_env: - extends: - - .codestyle_job - - .gitlab_native_build_job_prebuilt_env needs: - job: x86_64-opensuse-leap-15-container optional: true + script: + - source ci/jobs.sh + - run_codestyle variables: NAME: opensuse-leap-15 - -codestyle_local_env: - extends: - - .codestyle_job - - .gitlab_native_build_job_local_env - variables: - IMAGE: registry.opensuse.org/opensuse/leap:15.4 - NAME: opensuse-leap-15 - + TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.5 # This artifact published by this job is downloaded to push to Weblate # for translation usage: diff --git a/ci/gitlab/build-templates.yml b/ci/gitlab/build-templates.yml index 1f533ec2dd..75d9a6f127 100644 --- a/ci/gitlab/build-templates.yml +++ b/ci/gitlab/build-templates.yml @@ -20,16 +20,25 @@ # include CI changes # - Validating code committed to a fork branch # -# Note: the rules across the prebuilt_env and local_env templates +# Note: the rules across the prebuilt and local container scenarios # should be logical inverses, such that jobs are mutually exclusive # -.gitlab_native_build_job_prebuilt_env: - image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest +.gitlab_native_build_job: + image: $IMAGE stage: builds interruptible: true before_script: + - if test "$IMAGE" == "$TARGET_BASE_IMAGE" ; + then + source ci/buildenv/$NAME.sh ; + install_buildenv ; + fi - cat /packages.txt + variables: + IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME:latest rules: + ### Rules where we expect to use pre-built container images + # upstream: pushes to the default branch - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual @@ -63,49 +72,41 @@ - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' when: on_success - # upstream+forks: that's all folks - - when: never -.gitlab_native_build_job_local_env: - image: $IMAGE - stage: builds - interruptible: true - before_script: - - source ci/buildenv/$NAME.sh - - install_buildenv - - cat /packages.txt - rules: - # upstream: pushes to a non-default branch - - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' - when: manual - allow_failure: true - - 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 + ### Rules where we need to use the target base container image # 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 + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # 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 + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # forks: other web/api/scheduled pipelines - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $JOB_OPTIONAL' when: manual allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # 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' @@ -114,18 +115,28 @@ - ci/containers/$NAME.Dockerfile when: manual allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml - ci/containers/$NAME.Dockerfile when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # 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 + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE + + ### Neither prebuilt or local container images # upstream+forks: that's all folks - when: never @@ -146,16 +157,25 @@ # include CI changes # - Validating code committed to a fork branch # -# Note: the rules across the prebuilt_env and local_env templates +# Note: the rules across the prebuilt and local container scenarios # should be logical inverses, such that jobs are mutually exclusive # -.gitlab_cross_build_job_prebuilt_env: - image: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest +.gitlab_cross_build_job: + image: $IMAGE stage: builds interruptible: true before_script: + - if test "$IMAGE" == "$TARGET_BASE_IMAGE" ; + then + source ci/buildenv/$NAME-cross-$CROSS.sh ; + install_buildenv ; + fi - cat /packages.txt + variables: + IMAGE: $CI_REGISTRY/$RUN_UPSTREAM_NAMESPACE/libvirt/ci-$NAME-cross-$CROSS:latest rules: + ### Rules where we expect to use pre-built container images + # upstream: pushes to the default branch - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' when: manual @@ -189,49 +209,41 @@ - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' when: on_success - # upstream+forks: that's all folks - - when: never -.gitlab_cross_build_job_local_env: - image: $IMAGE - stage: builds - interruptible: true - before_script: - - source ci/buildenv/$NAME-cross-$CROSS.sh - - install_buildenv - - cat /packages.txt - rules: - # upstream: pushes to a non-default branch - - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH && $JOB_OPTIONAL' - when: manual - allow_failure: true - - 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 + ### Rules where we need to use the target base container image # 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 + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE == "push" && $RUN_PIPELINE' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # 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 + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PROJECT_NAMESPACE == $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $CI_COMMIT_REF_NAME != $CI_DEFAULT_BRANCH' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # forks: other web/api/scheduled pipelines - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/ && $JOB_OPTIONAL' when: manual allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PROJECT_NAMESPACE != $RUN_UPSTREAM_NAMESPACE && $CI_PIPELINE_SOURCE =~ /(web|api|schedule)/' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # 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' @@ -240,18 +252,28 @@ - ci/containers/$NAME-cross-$CROSS.Dockerfile when: manual allow_failure: true + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH' changes: - ci/gitlab/container-templates.yml - ci/containers/$NAME-cross-$CROSS.Dockerfile when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE # 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 + variables: + IMAGE: $TARGET_BASE_IMAGE - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME != $CI_DEFAULT_BRANCH' when: on_success + variables: + IMAGE: $TARGET_BASE_IMAGE + + ### Neither prebuilt or local container images # upstream+forks: that's all folks - when: never diff --git a/ci/gitlab/builds.yml b/ci/gitlab/builds.yml index 434e272e5a..49a0b27029 100644 --- a/ci/gitlab/builds.yml +++ b/ci/gitlab/builds.yml @@ -7,8 +7,8 @@ # Native build jobs -x86_64-almalinux-8-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-almalinux-8: + extends: .native_build_job needs: - job: x86_64-almalinux-8-container optional: true @@ -17,20 +17,11 @@ x86_64-almalinux-8-prebuilt-env: JOB_OPTIONAL: 1 NAME: almalinux-8 RPM: skip - -x86_64-almalinux-8-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/almalinux:8 - JOB_OPTIONAL: 1 - NAME: almalinux-8 - RPM: skip + TARGET_BASE_IMAGE: docker.io/library/almalinux:8 -x86_64-almalinux-8-clang-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-almalinux-8-clang: + extends: .native_build_job needs: - job: x86_64-almalinux-8-container optional: true @@ -39,108 +30,63 @@ x86_64-almalinux-8-clang-prebuilt-env: CC: clang NAME: almalinux-8 RPM: skip - -x86_64-almalinux-8-clang-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - CC: clang - IMAGE: docker.io/library/almalinux:8 - NAME: almalinux-8 - RPM: skip + TARGET_BASE_IMAGE: docker.io/library/almalinux:8 -x86_64-alpine-319-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-alpine-319: + extends: .native_build_job needs: - job: x86_64-alpine-319-container optional: true allow_failure: false variables: NAME: alpine-319 - -x86_64-alpine-319-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/alpine:3.19 - NAME: alpine-319 + TARGET_BASE_IMAGE: docker.io/library/alpine:3.19 -x86_64-alpine-edge-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-alpine-edge: + extends: .native_build_job needs: - job: x86_64-alpine-edge-container optional: true allow_failure: true variables: NAME: alpine-edge - -x86_64-alpine-edge-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: true - variables: - IMAGE: docker.io/library/alpine:edge - NAME: alpine-edge + TARGET_BASE_IMAGE: docker.io/library/alpine:edge -x86_64-centos-stream-8-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-centos-stream-8: + extends: .native_build_job needs: - job: x86_64-centos-stream-8-container optional: true allow_failure: false variables: NAME: centos-stream-8 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - -x86_64-centos-stream-8-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: quay.io/centos/centos:stream8 - NAME: centos-stream-8 + TARGET_BASE_IMAGE: quay.io/centos/centos:stream8 artifacts: expire_in: 1 day paths: - libvirt-rpms -x86_64-centos-stream-9-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-centos-stream-9: + extends: .native_build_job needs: - job: x86_64-centos-stream-9-container optional: true allow_failure: false variables: NAME: centos-stream-9 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - -x86_64-centos-stream-9-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: quay.io/centos/centos:stream9 - NAME: centos-stream-9 + TARGET_BASE_IMAGE: quay.io/centos/centos:stream9 artifacts: expire_in: 1 day paths: - libvirt-rpms -x86_64-debian-11-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-debian-11: + extends: .native_build_job needs: - job: x86_64-debian-11-container optional: true @@ -148,19 +94,11 @@ x86_64-debian-11-prebuilt-env: variables: JOB_OPTIONAL: 1 NAME: debian-11 - -x86_64-debian-11-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -x86_64-debian-11-clang-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-debian-11-clang: + extends: .native_build_job needs: - job: x86_64-debian-11-container optional: true @@ -168,143 +106,85 @@ x86_64-debian-11-clang-prebuilt-env: variables: JOB_OPTIONAL: 1 NAME: debian-11 - -x86_64-debian-11-clang-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -x86_64-debian-12-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-debian-12: + extends: .native_build_job needs: - job: x86_64-debian-12-container optional: true allow_failure: false variables: NAME: debian-12 - -x86_64-debian-12-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/debian:12-slim - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -x86_64-debian-12-clang-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-debian-12-clang: + extends: .native_build_job needs: - job: x86_64-debian-12-container optional: true allow_failure: false variables: NAME: debian-12 - -x86_64-debian-12-clang-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/debian:12-slim - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -x86_64-debian-sid-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-debian-sid: + extends: .native_build_job needs: - job: x86_64-debian-sid-container optional: true allow_failure: true variables: NAME: debian-sid - -x86_64-debian-sid-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: true - variables: - IMAGE: docker.io/library/debian:sid-slim - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -x86_64-fedora-38-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-fedora-38: + extends: .native_build_job needs: - job: x86_64-fedora-38-container optional: true allow_failure: false variables: NAME: fedora-38 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - -x86_64-fedora-38-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: registry.fedoraproject.org/fedora:38 - NAME: fedora-38 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38 artifacts: expire_in: 1 day paths: - libvirt-rpms -x86_64-fedora-39-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-fedora-39: + extends: .native_build_job needs: - job: x86_64-fedora-39-container optional: true allow_failure: false variables: NAME: fedora-39 - artifacts: - expire_in: 1 day - paths: - - libvirt-rpms - -x86_64-fedora-39-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: registry.fedoraproject.org/fedora:39 - NAME: fedora-39 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:39 artifacts: expire_in: 1 day paths: - libvirt-rpms -x86_64-fedora-rawhide-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-fedora-rawhide: + extends: .native_build_job needs: - job: x86_64-fedora-rawhide-container optional: true allow_failure: true variables: NAME: fedora-rawhide - -x86_64-fedora-rawhide-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: true - variables: - IMAGE: registry.fedoraproject.org/fedora:rawhide - NAME: fedora-rawhide + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide -x86_64-fedora-rawhide-clang-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-fedora-rawhide-clang: + extends: .native_build_job needs: - job: x86_64-fedora-rawhide-container optional: true @@ -313,20 +193,11 @@ x86_64-fedora-rawhide-clang-prebuilt-env: CC: clang NAME: fedora-rawhide RPM: skip - -x86_64-fedora-rawhide-clang-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: true - variables: - CC: clang - IMAGE: registry.fedoraproject.org/fedora:rawhide - NAME: fedora-rawhide - RPM: skip + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide -x86_64-opensuse-leap-15-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-opensuse-leap-15: + extends: .native_build_job needs: - job: x86_64-opensuse-leap-15-container optional: true @@ -335,20 +206,11 @@ x86_64-opensuse-leap-15-prebuilt-env: CFLAGS: -Wno-missing-include-dirs NAME: opensuse-leap-15 RPM: skip - -x86_64-opensuse-leap-15-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - CFLAGS: -Wno-missing-include-dirs - IMAGE: registry.opensuse.org/opensuse/leap:15.5 - NAME: opensuse-leap-15 - RPM: skip + TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/leap:15.5 -x86_64-opensuse-tumbleweed-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-opensuse-tumbleweed: + extends: .native_build_job needs: - job: x86_64-opensuse-tumbleweed-container optional: true @@ -356,19 +218,11 @@ x86_64-opensuse-tumbleweed-prebuilt-env: variables: NAME: opensuse-tumbleweed RPM: skip - -x86_64-opensuse-tumbleweed-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: true - variables: - IMAGE: registry.opensuse.org/opensuse/tumbleweed:latest - NAME: opensuse-tumbleweed - RPM: skip + TARGET_BASE_IMAGE: registry.opensuse.org/opensuse/tumbleweed:latest -x86_64-ubuntu-2004-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-ubuntu-2004: + extends: .native_build_job needs: - job: x86_64-ubuntu-2004-container optional: true @@ -377,22 +231,12 @@ x86_64-ubuntu-2004-prebuilt-env: ASAN_OPTIONS: verify_asan_link_order=0 MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined NAME: ubuntu-2004 - UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 - -x86_64-ubuntu-2004-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - ASAN_OPTIONS: verify_asan_link_order=0 - IMAGE: docker.io/library/ubuntu:20.04 - MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined - NAME: ubuntu-2004 + TARGET_BASE_IMAGE: docker.io/library/ubuntu:20.04 UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 -x86_64-ubuntu-2204-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-ubuntu-2204: + extends: .native_build_job needs: - job: x86_64-ubuntu-2204-container optional: true @@ -400,19 +244,11 @@ x86_64-ubuntu-2204-prebuilt-env: variables: JOB_OPTIONAL: 1 NAME: ubuntu-2204 + TARGET_BASE_IMAGE: docker.io/library/ubuntu:22.04 -x86_64-ubuntu-2204-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - IMAGE: docker.io/library/ubuntu:22.04 - JOB_OPTIONAL: 1 - NAME: ubuntu-2204 - -x86_64-ubuntu-2204-clang-prebuilt-env: - extends: .native_build_job_prebuilt_env +x86_64-ubuntu-2204-clang: + extends: .native_build_job needs: - job: x86_64-ubuntu-2204-container optional: true @@ -421,25 +257,15 @@ x86_64-ubuntu-2204-clang-prebuilt-env: CC: clang MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined NAME: ubuntu-2204 - UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 - -x86_64-ubuntu-2204-clang-local-env: - extends: .native_build_job_local_env - needs: [] - allow_failure: false - variables: - CC: clang - IMAGE: docker.io/library/ubuntu:22.04 - MESON_ARGS: -Db_lundef=false -Db_sanitize=address,undefined - NAME: ubuntu-2204 + TARGET_BASE_IMAGE: docker.io/library/ubuntu:22.04 UBSAN_OPTIONS: print_stacktrace=1:halt_on_error=1 # Cross build jobs -aarch64-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +aarch64-debian-11: + extends: .cross_build_job needs: - job: aarch64-debian-11-container optional: true @@ -448,20 +274,11 @@ aarch64-debian-11-prebuilt-env: CROSS: aarch64 JOB_OPTIONAL: 1 NAME: debian-11 - -aarch64-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: aarch64 - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -armv6l-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +armv6l-debian-11: + extends: .cross_build_job needs: - job: armv6l-debian-11-container optional: true @@ -470,20 +287,11 @@ armv6l-debian-11-prebuilt-env: CROSS: armv6l JOB_OPTIONAL: 1 NAME: debian-11 - -armv6l-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: armv6l - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -armv7l-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +armv7l-debian-11: + extends: .cross_build_job needs: - job: armv7l-debian-11-container optional: true @@ -492,20 +300,11 @@ armv7l-debian-11-prebuilt-env: CROSS: armv7l JOB_OPTIONAL: 1 NAME: debian-11 - -armv7l-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: armv7l - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -i686-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +i686-debian-11: + extends: .cross_build_job needs: - job: i686-debian-11-container optional: true @@ -514,20 +313,11 @@ i686-debian-11-prebuilt-env: CROSS: i686 JOB_OPTIONAL: 1 NAME: debian-11 - -i686-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: i686 - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -mips64el-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mips64el-debian-11: + extends: .cross_build_job needs: - job: mips64el-debian-11-container optional: true @@ -536,20 +326,11 @@ mips64el-debian-11-prebuilt-env: CROSS: mips64el JOB_OPTIONAL: 1 NAME: debian-11 - -mips64el-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mips64el - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -mipsel-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mipsel-debian-11: + extends: .cross_build_job needs: - job: mipsel-debian-11-container optional: true @@ -558,20 +339,11 @@ mipsel-debian-11-prebuilt-env: CROSS: mipsel JOB_OPTIONAL: 1 NAME: debian-11 - -mipsel-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mipsel - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -ppc64le-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +ppc64le-debian-11: + extends: .cross_build_job needs: - job: ppc64le-debian-11-container optional: true @@ -580,20 +352,11 @@ ppc64le-debian-11-prebuilt-env: CROSS: ppc64le JOB_OPTIONAL: 1 NAME: debian-11 - -ppc64le-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: ppc64le - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -s390x-debian-11-prebuilt-env: - extends: .cross_build_job_prebuilt_env +s390x-debian-11: + extends: .cross_build_job needs: - job: s390x-debian-11-container optional: true @@ -602,20 +365,11 @@ s390x-debian-11-prebuilt-env: CROSS: s390x JOB_OPTIONAL: 1 NAME: debian-11 - -s390x-debian-11-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: s390x - IMAGE: docker.io/library/debian:11-slim - JOB_OPTIONAL: 1 - NAME: debian-11 + TARGET_BASE_IMAGE: docker.io/library/debian:11-slim -aarch64-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +aarch64-debian-12: + extends: .cross_build_job needs: - job: aarch64-debian-12-container optional: true @@ -624,20 +378,11 @@ aarch64-debian-12-prebuilt-env: CROSS: aarch64 JOB_OPTIONAL: 1 NAME: debian-12 - -aarch64-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: aarch64 - IMAGE: docker.io/library/debian:12-slim - JOB_OPTIONAL: 1 - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -armv6l-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +armv6l-debian-12: + extends: .cross_build_job needs: - job: armv6l-debian-12-container optional: true @@ -646,20 +391,11 @@ armv6l-debian-12-prebuilt-env: CROSS: armv6l JOB_OPTIONAL: 1 NAME: debian-12 - -armv6l-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: armv6l - IMAGE: docker.io/library/debian:12-slim - JOB_OPTIONAL: 1 - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -armv7l-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +armv7l-debian-12: + extends: .cross_build_job needs: - job: armv7l-debian-12-container optional: true @@ -667,19 +403,11 @@ armv7l-debian-12-prebuilt-env: variables: CROSS: armv7l NAME: debian-12 - -armv7l-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: armv7l - IMAGE: docker.io/library/debian:12-slim - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -i686-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +i686-debian-12: + extends: .cross_build_job needs: - job: i686-debian-12-container optional: true @@ -688,20 +416,11 @@ i686-debian-12-prebuilt-env: CROSS: i686 JOB_OPTIONAL: 1 NAME: debian-12 - -i686-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: i686 - IMAGE: docker.io/library/debian:12-slim - JOB_OPTIONAL: 1 - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -mips64el-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mips64el-debian-12: + extends: .cross_build_job needs: - job: mips64el-debian-12-container optional: true @@ -710,20 +429,11 @@ mips64el-debian-12-prebuilt-env: CROSS: mips64el JOB_OPTIONAL: 1 NAME: debian-12 - -mips64el-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mips64el - IMAGE: docker.io/library/debian:12-slim - JOB_OPTIONAL: 1 - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -mipsel-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mipsel-debian-12: + extends: .cross_build_job needs: - job: mipsel-debian-12-container optional: true @@ -732,20 +442,11 @@ mipsel-debian-12-prebuilt-env: CROSS: mipsel JOB_OPTIONAL: 1 NAME: debian-12 - -mipsel-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mipsel - IMAGE: docker.io/library/debian:12-slim - JOB_OPTIONAL: 1 - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -ppc64le-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +ppc64le-debian-12: + extends: .cross_build_job needs: - job: ppc64le-debian-12-container optional: true @@ -754,20 +455,11 @@ ppc64le-debian-12-prebuilt-env: CROSS: ppc64le JOB_OPTIONAL: 1 NAME: debian-12 - -ppc64le-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: ppc64le - IMAGE: docker.io/library/debian:12-slim - JOB_OPTIONAL: 1 - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -s390x-debian-12-prebuilt-env: - extends: .cross_build_job_prebuilt_env +s390x-debian-12: + extends: .cross_build_job needs: - job: s390x-debian-12-container optional: true @@ -776,20 +468,11 @@ s390x-debian-12-prebuilt-env: CROSS: s390x JOB_OPTIONAL: 1 NAME: debian-12 - -s390x-debian-12-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: s390x - IMAGE: docker.io/library/debian:12-slim - JOB_OPTIONAL: 1 - NAME: debian-12 + TARGET_BASE_IMAGE: docker.io/library/debian:12-slim -aarch64-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env +aarch64-debian-sid: + extends: .cross_build_job needs: - job: aarch64-debian-sid-container optional: true @@ -798,20 +481,11 @@ aarch64-debian-sid-prebuilt-env: CROSS: aarch64 JOB_OPTIONAL: 1 NAME: debian-sid - -aarch64-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: aarch64 - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -armv6l-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env +armv6l-debian-sid: + extends: .cross_build_job needs: - job: armv6l-debian-sid-container optional: true @@ -820,20 +494,11 @@ armv6l-debian-sid-prebuilt-env: CROSS: armv6l JOB_OPTIONAL: 1 NAME: debian-sid - -armv6l-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: armv6l - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -armv7l-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env +armv7l-debian-sid: + extends: .cross_build_job needs: - job: armv7l-debian-sid-container optional: true @@ -842,20 +507,11 @@ armv7l-debian-sid-prebuilt-env: CROSS: armv7l JOB_OPTIONAL: 1 NAME: debian-sid - -armv7l-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: armv7l - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -i686-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env +i686-debian-sid: + extends: .cross_build_job needs: - job: i686-debian-sid-container optional: true @@ -864,20 +520,11 @@ i686-debian-sid-prebuilt-env: CROSS: i686 JOB_OPTIONAL: 1 NAME: debian-sid - -i686-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: i686 - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mips64el-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mips64el-debian-sid: + extends: .cross_build_job needs: - job: mips64el-debian-sid-container optional: true @@ -886,20 +533,11 @@ mips64el-debian-sid-prebuilt-env: CROSS: mips64el JOB_OPTIONAL: 1 NAME: debian-sid - -mips64el-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mips64el - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -ppc64le-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env +ppc64le-debian-sid: + extends: .cross_build_job needs: - job: ppc64le-debian-sid-container optional: true @@ -908,20 +546,11 @@ ppc64le-debian-sid-prebuilt-env: CROSS: ppc64le JOB_OPTIONAL: 1 NAME: debian-sid - -ppc64le-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: ppc64le - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -s390x-debian-sid-prebuilt-env: - extends: .cross_build_job_prebuilt_env +s390x-debian-sid: + extends: .cross_build_job needs: - job: s390x-debian-sid-container optional: true @@ -930,20 +559,11 @@ s390x-debian-sid-prebuilt-env: CROSS: s390x JOB_OPTIONAL: 1 NAME: debian-sid - -s390x-debian-sid-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: s390x - IMAGE: docker.io/library/debian:sid-slim - JOB_OPTIONAL: 1 - NAME: debian-sid + TARGET_BASE_IMAGE: docker.io/library/debian:sid-slim -mingw32-fedora-38-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mingw32-fedora-38: + extends: .cross_build_job needs: - job: mingw32-fedora-38-container optional: true @@ -952,20 +572,11 @@ mingw32-fedora-38-prebuilt-env: CROSS: mingw32 JOB_OPTIONAL: 1 NAME: fedora-38 - -mingw32-fedora-38-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mingw32 - IMAGE: registry.fedoraproject.org/fedora:38 - JOB_OPTIONAL: 1 - NAME: fedora-38 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38 -mingw64-fedora-38-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mingw64-fedora-38: + extends: .cross_build_job needs: - job: mingw64-fedora-38-container optional: true @@ -973,19 +584,11 @@ mingw64-fedora-38-prebuilt-env: variables: CROSS: mingw64 NAME: fedora-38 - -mingw64-fedora-38-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: false - variables: - CROSS: mingw64 - IMAGE: registry.fedoraproject.org/fedora:38 - NAME: fedora-38 + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:38 -mingw32-fedora-rawhide-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mingw32-fedora-rawhide: + extends: .cross_build_job needs: - job: mingw32-fedora-rawhide-container optional: true @@ -993,19 +596,11 @@ mingw32-fedora-rawhide-prebuilt-env: variables: CROSS: mingw32 NAME: fedora-rawhide - -mingw32-fedora-rawhide-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: true - variables: - CROSS: mingw32 - IMAGE: registry.fedoraproject.org/fedora:rawhide - NAME: fedora-rawhide + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide -mingw64-fedora-rawhide-prebuilt-env: - extends: .cross_build_job_prebuilt_env +mingw64-fedora-rawhide: + extends: .cross_build_job needs: - job: mingw64-fedora-rawhide-container optional: true @@ -1014,16 +609,7 @@ mingw64-fedora-rawhide-prebuilt-env: CROSS: mingw64 JOB_OPTIONAL: 1 NAME: fedora-rawhide - -mingw64-fedora-rawhide-local-env: - extends: .cross_build_job_local_env - needs: [] - allow_failure: true - variables: - CROSS: mingw64 - IMAGE: registry.fedoraproject.org/fedora:rawhide - JOB_OPTIONAL: 1 - NAME: fedora-rawhide + TARGET_BASE_IMAGE: registry.fedoraproject.org/fedora:rawhide # Native cirrus build jobs diff --git a/ci/integration-template.yml b/ci/integration-template.yml index 166445527c..ded57cfaaf 100644 --- a/ci/integration-template.yml +++ b/ci/integration-template.yml @@ -47,6 +47,10 @@ .integration_tests: stage: integration_tests + rules: + - if: '$LIBVIRT_CI_INTEGRATION == null' + when: never + - !reference [.gitlab_native_build_job, rules] before_script: - mkdir "$SCRATCH_DIR" - sudo dnf install -y libvirt-rpms/* libvirt-perl-rpms/* libvirt-python-rpms/* @@ -65,35 +69,13 @@ - logs when: on_failure -.integration_tests_prebuilt_env: - extends: .integration_tests - rules: - - if: '$LIBVIRT_CI_INTEGRATION == null' - when: never - - !reference [.gitlab_native_build_job_prebuilt_env, rules] - -.integration_tests_local_env: - extends: .integration_tests - rules: - - if: '$LIBVIRT_CI_INTEGRATION == null' - when: never - - !reference [.gitlab_native_build_job_local_env, rules] - # YAML anchors don't work with Shell conditions so we can't use a variable # to conditionally build+install QEMU from source. # Instead, create a new test job template for this scenario. .integration_tests_upstream_qemu: + extends: + - .integration_tests before_script: - !reference [.integration_tests, before_script] - *qemu-build-template - -.integration_tests_upstream_qemu_prebuilt_env: - extends: - - .integration_tests_prebuilt_env - - .integration_tests_upstream_qemu - -.integration_tests_upstream_qemu_local_env: - extends: - - .integration_tests_local_env - - .integration_tests_upstream_qemu diff --git a/ci/integration.yml b/ci/integration.yml index 1614aa56d6..f754c59962 100644 --- a/ci/integration.yml +++ b/ci/integration.yml @@ -5,7 +5,8 @@ include: # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.centos-stream-8-tests: +centos-stream-8-tests: + extends: .integration_tests variables: # needed by libvirt-gitlab-executor DISTRO: centos-stream-8 @@ -13,43 +14,23 @@ include: LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG - -centos-stream-8-tests-prebuilt-env: - extends: - - .integration_tests_prebuilt_env - - .centos-stream-8-tests needs: - - x86_64-centos-stream-8-prebuilt-env + - x86_64-centos-stream-8 - project: libvirt/libvirt-perl - job: x86_64-centos-stream-8-prebuilt-env + job: x86_64-centos-stream-8 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-centos-stream-8-prebuilt-env + job: x86_64-centos-stream-8 ref: master artifacts: true -centos-stream-8-tests-local-env: - extends: - - .integration_tests_local_env - - .centos-stream-8-tests - needs: - - x86_64-centos-stream-8-local-env - - project: libvirt/libvirt-perl - job: x86_64-centos-stream-8-prebuilt-env - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-centos-stream-8-prebuilt-env - ref: master - artifacts: true - - # NOTE The integration tests use artifacts produced by the libvirt-perl # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.centos-stream-9-tests: +centos-stream-9-tests: + extends: .integration_tests variables: # needed by libvirt-gitlab-executor DISTRO: centos-stream-9 @@ -57,43 +38,23 @@ centos-stream-8-tests-local-env: LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG - -centos-stream-9-tests-prebuilt-env: - extends: - - .integration_tests_prebuilt_env - - .centos-stream-9-tests needs: - - x86_64-centos-stream-9-prebuilt-env + - x86_64-centos-stream-9 - project: libvirt/libvirt-perl - job: x86_64-centos-stream-9-prebuilt-env + job: x86_64-centos-stream-9 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-centos-stream-9-prebuilt-env + job: x86_64-centos-stream-9 ref: master artifacts: true -centos-stream-9-tests-local-env: - extends: - - .integration_tests_local_env - - .centos-stream-9-tests - needs: - - x86_64-centos-stream-9-local-env - - project: libvirt/libvirt-perl - job: x86_64-centos-stream-9-prebuilt-env - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-centos-stream-9-prebuilt-env - ref: master - artifacts: true - - # NOTE The integration tests use artifacts produced by the libvirt-perl # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.fedora-38-tests: +fedora-38-tests: + extends: .integration_tests variables: # needed by libvirt-gitlab-executor DISTRO: fedora-38 @@ -101,43 +62,23 @@ centos-stream-9-tests-local-env: LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG - -fedora-38-tests-prebuilt-env: - extends: - - .integration_tests_prebuilt_env - - .fedora-38-tests needs: - - x86_64-fedora-38-prebuilt-env + - x86_64-fedora-38 - project: libvirt/libvirt-perl - job: x86_64-fedora-38-prebuilt-env + job: x86_64-fedora-38 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-38-prebuilt-env + job: x86_64-fedora-38 ref: master artifacts: true -fedora-38-tests-local-env: - extends: - - .integration_tests_local_env - - .fedora-38-tests - needs: - - x86_64-fedora-38-local-env - - project: libvirt/libvirt-perl - job: x86_64-fedora-38-prebuilt-env - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-fedora-38-prebuilt-env - ref: master - artifacts: true - - # NOTE The integration tests use artifacts produced by the libvirt-perl # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. -.fedora-39-tests: +fedora-39-tests: + extends: .integration_tests variables: # needed by libvirt-gitlab-executor DISTRO: fedora-39 @@ -145,43 +86,23 @@ fedora-38-tests-local-env: LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG - -fedora-39-tests-prebuilt-env: - extends: - - .integration_tests_prebuilt_env - - .fedora-39-tests - needs: - - x86_64-fedora-39-prebuilt-env - - project: libvirt/libvirt-perl - job: x86_64-fedora-39-prebuilt-env - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-fedora-39-prebuilt-env - ref: master - artifacts: true - -fedora-39-tests-local-env: - extends: - - .integration_tests_local_env - - .fedora-39-tests needs: - - x86_64-fedora-39-local-env + - x86_64-fedora-39 - project: libvirt/libvirt-perl - job: x86_64-fedora-39-prebuilt-env + job: x86_64-fedora-39 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39-prebuilt-env + job: x86_64-fedora-39 ref: master artifacts: true - # NOTE The integration tests use artifacts produced by the libvirt-perl # and libvirt-python CI jobs, so the new target needs to be introduced # there before it can be used here. The VM template for the target # also needs to be created on the runner host. .fedora-39-upstream-qemu-tests: + extends: .integration_tests variables: # needed by libvirt-gitlab-executor DISTRO: fedora-39 @@ -189,33 +110,13 @@ fedora-39-tests-local-env: LIBVIRT_CI_INTEGRATION_RUNNER_TAG: redhat-vm-host tags: - $LIBVIRT_CI_INTEGRATION_RUNNER_TAG - -fedora-39-upstream-qemu-tests-prebuilt-env: - extends: - - .integration_tests_upstream_qemu_prebuilt_env - - .fedora-39-upstream-qemu-tests - needs: - - x86_64-fedora-39-prebuilt-env - - project: libvirt/libvirt-perl - job: x86_64-fedora-39-prebuilt-env - ref: master - artifacts: true - - project: libvirt/libvirt-python - job: x86_64-fedora-39-prebuilt-env - ref: master - artifacts: true - -fedora-39-upstream-qemu-tests-local-env: - extends: - - .integration_tests_upstream_qemu_local_env - - .fedora-39-upstream-qemu-tests needs: - - x86_64-fedora-39-local-env + - x86_64-fedora-39 - project: libvirt/libvirt-perl - job: x86_64-fedora-39-prebuilt-env + job: x86_64-fedora-39 ref: master artifacts: true - project: libvirt/libvirt-python - job: x86_64-fedora-39-prebuilt-env + job: x86_64-fedora-39 ref: master artifacts: true -- 2.43.0

2 2

Question/comment on nbdkit support in libvirt.spec
by Richard W.M. Jones 19 Jan '24

19 Jan '24

In this section (under %package libvirt-daemon-driver-qemu): %if %{with_nbdkit} Recommends: nbdkit Recommends: nbdkit-curl-plugin Recommends: nbdkit-ssh-plugin %endif You could save a bit of space by removing "Recommends: nbdkit" and replacing it with: Recommends: nbdkit-server Recommends: nbdkit-readahead-filter In Fedora packaging "nbdkit" is a meta-package which pulls in nbdkit-server, nbdkit-basic-plugins and nbdkit-basic-filters. This meta-package is intended to get a useful, functional nbdkit, but it's not very minimal. The basic plugins/filters pull in about an extra 1.3MB. nbdkit-basic-{plugins,filters} also "Provides" the names of the individual plugins and filters, so if (for example) you wanted the file plugin then you could just "Recommends: nbdkit-file-plugin" which would pull in nbdkit-basic-plugins (or something else if we ever moved that plugin to another package). nbdkit-curl-plugin / nbdkit-ssh-plugin are packaged separately because they have non-trivial dependencies on external libraries, and using Recommends for those is absolutely correct. They depend on nbdkit-server so it's not strictly needed to also "Recommends: nbdkit-server", but it is better for clarity. nbdkit-server includes nbdkit-null-plugin so you can still use that for probing filters. (I asked another question on a Jira ticket about if you are using --readonly since that improves performance with nbdkit-curl-plugin. Checking the source code I see you are, so that's great.) Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-p2v converts physical machines to virtual machines. Boot with a live CD or over the network (PXE) and turn machines into KVM guests. http://libguestfs.org/virt-v2v

2 3

[PULL 16/36] hw/block: Deprecate the TC58128 block device
by Philippe Mathieu-Daudé 19 Jan '24

19 Jan '24

From: Samuel Tardieu <sam(a)rfc1149.net> The 16MiB flash device is only used by the deprecated shix machine. Its code it old and unmaintained, and has never been adapted to the QOM architecture. It still contains debug statements and uses global variables. It is time to deprecate it. Signed-off-by: Samuel Tardieu <sam(a)rfc1149.net> Reviewed-by: Cédric Le Goater <clg(a)redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> Message-ID: <20240109083053.2581588-3-sam(a)rfc1149.net> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- docs/about/deprecated.rst | 2 +- hw/block/tc58128.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index e6a12c9077..15e39f8bbb 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -273,7 +273,7 @@ The Nios II architecture is orphan. '''''''''''''''''''' The machine is no longer in existence and has been long unmaintained -in QEMU. +in QEMU. This also holds for the TC51828 16MiB flash that it uses. Backend options --------------- diff --git a/hw/block/tc58128.c b/hw/block/tc58128.c index d350126b27..6944cf58fa 100644 --- a/hw/block/tc58128.c +++ b/hw/block/tc58128.c @@ -202,6 +202,7 @@ static sh7750_io_device tc58128 = { int tc58128_init(struct SH7750State *s, const char *zone1, const char *zone2) { + warn_report_once("The TC58128 flash device is deprecated"); init_dev(&tc58128_devs[0], zone1); init_dev(&tc58128_devs[1], zone2); return sh7750_register_io_device(s, &tc58128); -- 2.41.0

1 0

[PULL 15/36] target/sh4: Deprecate the shix machine
by Philippe Mathieu-Daudé 19 Jan '24

19 Jan '24

From: Samuel Tardieu <sam(a)rfc1149.net> The shix machine has been designed and used at Télécom Paris from 2003 to 2010. It had been added to QEMU in 2005 and has not been maintained since. Since nobody is using the physical board anymore nor interested in maintaining the QEMU port, it is time to deprecate it. Signed-off-by: Samuel Tardieu <sam(a)rfc1149.net> Reviewed-by: Cédric Le Goater <clg(a)redhat.com> Reviewed-by: Yoshinori Sato <ysato(a)users.sourceforge.jp> Reviewed-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> Message-ID: <20240109083053.2581588-2-sam(a)rfc1149.net> Signed-off-by: Philippe Mathieu-Daudé <philmd(a)linaro.org> --- docs/about/deprecated.rst | 5 +++++ hw/sh4/shix.c | 1 + 2 files changed, 6 insertions(+) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index 2e15040246..e6a12c9077 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -269,6 +269,11 @@ Nios II ``10m50-ghrd`` and ``nios2-generic-nommu`` machines (since 8.2) The Nios II architecture is orphan. +``shix`` (since 9.0) +'''''''''''''''''''' + +The machine is no longer in existence and has been long unmaintained +in QEMU. Backend options --------------- diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c index aa812512f0..eb3150b5bc 100644 --- a/hw/sh4/shix.c +++ b/hw/sh4/shix.c @@ -80,6 +80,7 @@ static void shix_machine_init(MachineClass *mc) mc->init = shix_init; mc->is_default = true; mc->default_cpu_type = TYPE_SH7750R_CPU; + mc->deprecation_reason = "old and unmaintained"; } DEFINE_MACHINE("shix", shix_machine_init) -- 2.41.0

1 0

[PATCH v2 0/2] ppc: Rename power5+ and power7+ for the new QOM naming rules
by Thomas Huth 18 Jan '24

18 Jan '24

We can get rid of the "power5+" / "power7+" hack in qom/object.c by using CPU aliases for those names instead (first patch). I think in the long run, we should get rid of the names with a "+" in it completely, so the second patch suggests to deprecate those, but I'd also be fine if we keep the aliases around, so in that case please ignore the second patch. v2: - Use "power5p" / "power7p" instead of "power5plus" / "power7plus" Thomas Huth (2): target/ppc/cpu-models: Rename power5+ and power7+ for new QOM naming rules docs/about: Deprecate the old "power5+" and "power7+" CPU names docs/about/deprecated.rst | 9 +++++++++ hw/ppc/spapr_cpu_core.c | 4 ++-- qom/object.c | 4 ---- target/ppc/cpu-models.c | 10 ++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) -- 2.43.0

4 7

[PATCH 0/3] qapi/hmp/cli: Remove the deprecated 'singlestep'
by Philippe Mathieu-Daudé 17 Jan '24

17 Jan '24

Deprecated for 8.1, good to go for 9.0. Based-on: <20240112100059.965041-5-thuth(a)redhat.com> "Remove deprecated command line options" Philippe Mathieu-Daudé (3): qapi: Remove deprecated 'singlestep' member of StatusInfo hmp: Remove deprecated 'singlestep' command cli: Remove deprecated '-singlestep' command line option docs/about/deprecated.rst | 40 --------------------------------- docs/about/removed-features.rst | 24 ++++++++++++++++++++ docs/user/main.rst | 6 ----- qapi/run-state.json | 11 --------- bsd-user/main.c | 3 +-- linux-user/main.c | 2 -- system/runstate.c | 8 ------- system/vl.c | 18 +-------------- tests/qtest/test-hmp.c | 1 - hmp-commands.hx | 13 ----------- qemu-options.hx | 8 ------- tests/qemu-iotests/183.out | 4 ++-- tests/qemu-iotests/234.out | 8 +++---- tests/qemu-iotests/262.out | 4 ++-- tests/qemu-iotests/280.out | 2 +- 15 files changed, 35 insertions(+), 117 deletions(-) -- 2.41.0

4 6

[libvirt PATCH] news: document my changes for 10.0.0
by Ján Tomko 17 Jan '24

17 Jan '24

Signed-off-by: Ján Tomko <jtomko(a)redhat.com> --- NEWS.rst | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS.rst b/NEWS.rst index e5df8224e9..4c799999fe 100644 --- a/NEWS.rst +++ b/NEWS.rst @@ -72,6 +72,12 @@ v10.0.0 (2024-01-15) change in a future release and can be customized with the nbdkit_config_default build option. + * qemu: add ID mapping support for virtiofsd + + New ``<idmap>`` element was added for virtiofsd-based ``<filesystem>`` + devices. It can be used to set up UID and GID mapping between host + and guest, making running virtiofsd unprivileged much more useful. + * **Improvements** * qemu: Improve migration XML use when persisting VM on destination @@ -94,6 +100,11 @@ v10.0.0 (2024-01-15) The test driver now supports basic hotplug and hotunplug of PCI devices. + * qemu: allow virtiofsd to run unprivileged + + Nowadays virtiofsd no longer requires to run with root privileges, so the + restriction to always run as root is now removed from libvirt too. + * **Bug fixes** * qemu: Various migration bug fixes and debuggability improvement -- 2.42.0

2 1

[PATCH 00/18] Grab bag of fixes and improvements
by Andrea Bolognani 17 Jan '24

17 Jan '24

This started out as a way to make the upcoming loongarch64 support slightly nicer to implement, but ended up including a bunch of tangentially related changes. Since trying to unentangle them would just result in a bunch of smaller series that still have dependencies on each other, I'm just sending everything at once. Andrea Bolognani (18): tests: Add devices to pseries-phb-simple tests: Add pseries-phb-user-alias qemu: Fix handling of user aliases for default PHB tests: Drop aarch64-virtio-pci-default tests: Add {aarch64,riscv64}-virt-headless-mmio tests: Drop various redundant tests tests: Simplify balloon-mmio-deflate tests: Request virtio-mmio for balloon-mmio-deflate qemu: Stop checking QEMU_CAPS_OBJECT_GPEX qemu: Retire QEMU_CAPS_OBJECT_GPEX qemu: Improve qemuDomainSupportsPCI() qemu: Move qemuDomainSupportsPCIMultibus() qemu: Improve qemuDomainSupportsPCIMultibus() tests: Add *-default-net qemu: Improve qemuDomainDefaultNetModel() tests: Add *-default-devices qemu: Don't add memballoon by default on RISC-V qemu: Default to no USB and no memballoon for new architectures src/qemu/qemu_alias.c | 2 +- src/qemu/qemu_capabilities.c | 31 +----- src/qemu/qemu_capabilities.h | 4 +- src/qemu/qemu_command.c | 25 ++++- src/qemu/qemu_domain.c | 94 ++++++++++++------- src/qemu/qemu_domain.h | 4 +- src/qemu/qemu_domain_address.c | 2 +- .../caps_4.2.0_aarch64.xml | 1 - .../caps_5.0.0_aarch64.xml | 1 - .../caps_5.0.0_riscv64.xml | 1 - .../caps_5.2.0_aarch64.xml | 1 - .../caps_5.2.0_riscv64.xml | 1 - .../caps_5.2.0_x86_64.xml | 1 - .../caps_6.0.0_aarch64.xml | 1 - .../caps_6.0.0_x86_64.xml | 1 - .../caps_6.1.0_x86_64.xml | 1 - .../caps_6.2.0_aarch64.xml | 1 - .../caps_6.2.0_x86_64.xml | 1 - .../caps_7.0.0_aarch64+hvf.xml | 1 - .../caps_7.0.0_aarch64.xml | 1 - .../caps_7.0.0_x86_64.xml | 1 - .../caps_7.1.0_x86_64.xml | 1 - .../caps_7.2.0_x86_64+hvf.xml | 1 - .../caps_7.2.0_x86_64.xml | 1 - .../caps_8.0.0_riscv64.xml | 1 - .../caps_8.0.0_x86_64.xml | 1 - .../caps_8.1.0_x86_64.xml | 1 - .../caps_8.2.0_aarch64.xml | 1 - .../caps_8.2.0_x86_64.xml | 1 - .../caps_9.0.0_x86_64.xml | 1 - ...ch64-aavmf-virtio-mmio.aarch64-latest.args | 46 --------- .../aarch64-aavmf-virtio-mmio.xml | 49 ---------- ...arch64-default-devices.aarch64-latest.args | 31 ++++++ .../aarch64-default-devices.xml | 12 +++ .../aarch64-default-net.aarch64-latest.args | 35 +++++++ .../qemuxml2argvdata/aarch64-default-net.xml | 17 ++++ ...h64-virt-headless-mmio.aarch64-latest.args | 48 ++++++++++ .../aarch64-virt-headless-mmio.xml | 48 ++++++++++ ...ch64-virtio-pci-default.aarch64-4.2.0.args | 54 ----------- ...h64-virtio-pci-default.aarch64-latest.args | 54 ----------- .../aarch64-virtio-pci-default.xml | 44 --------- .../arm-virt-virtio.aarch64-latest.args | 54 ----------- tests/qemuxml2argvdata/arm-virt-virtio.xml | 45 --------- .../balloon-mmio-deflate.aarch64-latest.args | 4 - .../qemuxml2argvdata/balloon-mmio-deflate.xml | 17 +--- ...> ppc64-default-devices.ppc64-latest.args} | 22 ++--- .../ppc64-default-devices.xml | 12 +++ ...gs => ppc64-default-net.ppc64-latest.args} | 22 ++--- ...s-phb-simple.xml => ppc64-default-net.xml} | 12 +-- .../pseries-phb-simple.ppc64-latest.args | 5 +- tests/qemuxml2argvdata/pseries-phb-simple.xml | 11 ++- ... pseries-phb-user-alias.ppc64-latest.args} | 7 +- .../pseries-phb-user-alias.xml | 30 ++++++ ...iscv64-default-devices.riscv64-latest.args | 30 ++++++ .../riscv64-default-devices.xml | 12 +++ .../riscv64-default-net.riscv64-latest.args | 34 +++++++ .../qemuxml2argvdata/riscv64-default-net.xml | 17 ++++ ...64-virt-headless-mmio.riscv64-latest.args} | 39 ++++---- .../riscv64-virt-headless-mmio.xml | 43 +++++++++ .../riscv64-virt-pci.riscv64-latest.args | 35 ------- tests/qemuxml2argvdata/riscv64-virt-pci.xml | 24 ----- .../riscv64-virt.riscv64-latest.args | 38 -------- tests/qemuxml2argvdata/riscv64-virt.xml | 19 ---- .../s390x-default-devices.s390x-latest.args | 32 +++++++ .../s390x-default-devices.xml | 12 +++ .../s390x-default-net.s390x-latest.args | 33 +++++++ tests/qemuxml2argvdata/s390x-default-net.xml | 17 ++++ .../x86_64-default-devices.x86_64-latest.args | 33 +++++++ .../x86_64-default-devices.xml | 12 +++ .../x86_64-default-net.x86_64-latest.args | 33 +++++++ tests/qemuxml2argvdata/x86_64-default-net.xml | 17 ++++ tests/qemuxml2argvtest.c | 47 ++++------ ...rch64-aavmf-virtio-mmio.aarch64-latest.xml | 56 ----------- ...aarch64-default-devices.aarch64-latest.xml | 26 +++++ .../aarch64-default-net.aarch64-latest.xml | 43 +++++++++ ...ch64-virt-headless-mmio.aarch64-latest.xml | 71 ++++++++++++++ ...ch64-virtio-pci-default.aarch64-latest.xml | 94 ------------------- ...=> ppc64-default-devices.ppc64-latest.xml} | 24 ++--- ...xml => ppc64-default-net.ppc64-latest.xml} | 23 ++--- .../pseries-phb-simple.ppc64-latest.xml | 14 ++- ...> pseries-phb-user-alias.ppc64-latest.xml} | 18 +++- ...riscv64-default-devices.riscv64-latest.xml | 20 ++++ .../riscv64-default-net.riscv64-latest.xml | 37 ++++++++ ...cv64-virt-headless-mmio.riscv64-latest.xml | 58 ++++++++++++ .../s390x-default-devices.s390x-latest.xml | 27 ++++++ .../s390x-default-net.s390x-latest.xml | 31 ++++++ .../x86_64-default-devices.x86_64-latest.xml | 31 ++++++ .../x86_64-default-net.x86_64-latest.xml | 32 +++++++ tests/qemuxml2xmltest.c | 21 ++++- 89 files changed, 1162 insertions(+), 855 deletions(-) delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.xml create mode 100644 tests/qemuxml2argvdata/aarch64-default-devices.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-default-devices.xml create mode 100644 tests/qemuxml2argvdata/aarch64-default-net.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-default-net.xml create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless-mmio.aarch64-latest.args create mode 100644 tests/qemuxml2argvdata/aarch64-virt-headless-mmio.xml delete mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-4.2.0.args delete mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/aarch64-virtio-pci-default.xml delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.aarch64-latest.args delete mode 100644 tests/qemuxml2argvdata/arm-virt-virtio.xml copy tests/qemuxml2argvdata/{pseries-phb-simple.ppc64-latest.args => ppc64-default-devices.ppc64-latest.args} (56%) create mode 100644 tests/qemuxml2argvdata/ppc64-default-devices.xml copy tests/qemuxml2argvdata/{pseries-phb-simple.ppc64-latest.args => ppc64-default-net.ppc64-latest.args} (56%) copy tests/qemuxml2argvdata/{pseries-phb-simple.xml => ppc64-default-net.xml} (55%) copy tests/qemuxml2argvdata/{pseries-phb-simple.ppc64-latest.args => pseries-phb-user-alias.ppc64-latest.args} (75%) create mode 100644 tests/qemuxml2argvdata/pseries-phb-user-alias.xml create mode 100644 tests/qemuxml2argvdata/riscv64-default-devices.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/riscv64-default-devices.xml create mode 100644 tests/qemuxml2argvdata/riscv64-default-net.riscv64-latest.args create mode 100644 tests/qemuxml2argvdata/riscv64-default-net.xml rename tests/qemuxml2argvdata/{aarch64-virt-virtio-MMIO.aarch64.latest.args => riscv64-virt-headless-mmio.riscv64-latest.args} (50%) create mode 100644 tests/qemuxml2argvdata/riscv64-virt-headless-mmio.xml delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.riscv64-latest.args delete mode 100644 tests/qemuxml2argvdata/riscv64-virt-pci.xml delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.riscv64-latest.args delete mode 100644 tests/qemuxml2argvdata/riscv64-virt.xml create mode 100644 tests/qemuxml2argvdata/s390x-default-devices.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390x-default-devices.xml create mode 100644 tests/qemuxml2argvdata/s390x-default-net.s390x-latest.args create mode 100644 tests/qemuxml2argvdata/s390x-default-net.xml create mode 100644 tests/qemuxml2argvdata/x86_64-default-devices.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-devices.xml create mode 100644 tests/qemuxml2argvdata/x86_64-default-net.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/x86_64-default-net.xml delete mode 100644 tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-default-devices.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-default-net.aarch64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/aarch64-virt-headless-mmio.aarch64-latest.xml delete mode 100644 tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.aarch64-latest.xml copy tests/qemuxml2xmloutdata/{pseries-phb-simple.ppc64-latest.xml => ppc64-default-devices.ppc64-latest.xml} (58%) copy tests/qemuxml2xmloutdata/{pseries-phb-simple.ppc64-latest.xml => ppc64-default-net.ppc64-latest.xml} (63%) copy tests/qemuxml2xmloutdata/{pseries-phb-simple.ppc64-latest.xml => pseries-phb-user-alias.ppc64-latest.xml} (69%) create mode 100644 tests/qemuxml2xmloutdata/riscv64-default-devices.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-default-net.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/riscv64-virt-headless-mmio.riscv64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390x-default-devices.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/s390x-default-net.s390x-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-devices.x86_64-latest.xml create mode 100644 tests/qemuxml2xmloutdata/x86_64-default-net.x86_64-latest.xml -- 2.43.0

3 49

[PATCH 0/2] ppc: Rename power5+ and power7+ for the new QOM naming rules
by Thomas Huth 17 Jan '24

17 Jan '24

We can get rid of the "power5+" / "power7+" hack in qom/object.c by using CPU aliases for those names instead (first patch). I think in the long run, we should get rid of the names with a "+" in it completely, so the second patch suggests to deprecate those, but I'd also be fine if we keep the aliases around, so in that case please ignore the second patch. Thomas Huth (2): target/ppc/cpu-models: Rename power5+ and power7+ for new QOM naming rules docs/about: Deprecate the old "power5+" and "power7+" CPU names docs/about/deprecated.rst | 9 +++++++++ hw/ppc/spapr_cpu_core.c | 4 ++-- qom/object.c | 4 ---- target/ppc/cpu-models.c | 10 ++++++---- 4 files changed, 17 insertions(+), 10 deletions(-) -- 2.43.0

6 12