libvirt-python 10.0.0__tar.gz → 10.2.0__tar.gz

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/.gitlab-ci.yml

@@ -15,6 +15,8 @@ stages:
   export CFLAGS="-Werror"
 
 .native_git_build_job:
+  extends:
+    - .gitlab_native_build_job
   script:
     - *git_build_vars
     - pushd "$PWD"
@@ -36,17 +38,9 @@ stages:
           mv rpmbuild/RPMS/x86_64/ libvirt-python-rpms ;
       fi
 
-.native_git_build_job_prebuilt_env:
-  extends:
-    - .native_git_build_job
-    - .gitlab_native_build_job_prebuilt_env
-
-.native_git_build_job_local_env:
-  extends:
-    - .native_git_build_job
-    - .gitlab_native_build_job_local_env
-
 .native_build_job:
+  extends:
+    - .gitlab_native_build_job
   script:
     - export MAKEFLAGS="-j$(getconf _NPROCESSORS_ONLN)"
     - export CFLAGS="-Werror"
@@ -61,19 +55,14 @@ stages:
           mv rpmbuild/RPMS/x86_64/ libvirt-python-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
-
 include: '/ci/gitlab.yml'
 
-.api_coverage_job:
+api_coverage_job:
+  extends:
+    - .gitlab_native_build_job
+  needs:
+    - job: x86_64-centos-stream-9-git
+      artifacts: true
   stage: sanity_checks
   script:
     - *git_build_vars
@@ -81,24 +70,6 @@ include: '/ci/gitlab.yml'
     - test-venv/bin/python -m pip install dist/libvirt_python*.whl
     - LIBVIRT_API_COVERAGE=1 test-venv/bin/python -m pytest tests
   allow_failure: true
-
-api_coverage_prebuilt_env:
-  extends:
-    - .gitlab_native_build_job_prebuilt_env
-    - .api_coverage_job
-  needs:
-    - job: x86_64-centos-stream-8-git-prebuilt-env
-      artifacts: true
-  variables:
-    NAME: centos-stream-8
-
-api_coverage_local_env:
-  extends:
-    - .gitlab_native_build_job_local_env
-    - .api_coverage_job
-  needs:
-    - job: x86_64-centos-stream-8-git-local-env
-      artifacts: true
   variables:
-    IMAGE: quay.io/centos/centos:stream8
-    NAME: centos-stream-8
+    NAME: centos-stream-9
+    TARGET_BASE_IMAGE: quay.io/centos/centos:stream9

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/AUTHORS

@@ -94,6 +94,7 @@ The individual contributors are
    Tomáš Golembiovský <tgolembi@redhat.com>
    Victor Stinner <victor.stinner@gmail.com>
    Viktor Mihajlovski <mihajlov@linux.vnet.ibm.com>
+   Vincent Vanlaer <libvirt-e6954efa@volkihar.be>
    Vincent Vanlaer <vincent.vanlaer@skynet.be>
    w00506750 <hogan.wang@huawei.com>
    Wojtek Porczyk <woju@invisiblethingslab.com>

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ChangeLog

@@ -1,3 +1,56 @@
+ 2024- 3- 1 Jiri Denemark <jdenemar@redhat.com>
+    
+    Post-release version bump to 10.2.0
+    
+    
+ 2024- 2- 27 Michal Privoznik <mprivozn@redhat.com>
+    
+    ci: Switch native_git_build_job to c9s and resume api_coverage_job
+    Currently, there's just one native_git_build_job -
+    x86_64-centos-stream-8-git and this is a problem because that's
+    the job that api_coverage_job then uses. But CentOS Stream 8 has
+    too old lxml which then makes tests/test_api_coverage.py skip its
+    run. By switching to CentOS Stream 9 the test can run happily
+    again.
+    
+    
+    
+ 2024- 2- 27 Michal Privoznik <mprivozn@redhat.com>
+    
+    test_api_coverage: Reflect different naming in python for virDomainFDAssociate() and virDomainRestoreParams()
+    While virDomainRestoreParams() has 'virDomain' prefix (and thus
+    is put into Domain class), it is really in the same family as
+    virDomainRestore() or virDomainRestoreFlags() -> it acts upon
+    virConnect object and thus belongs into Connect class.
+    
+    Then, virDomainFDAssociate is exposed as Domain.FDAssociate() but
+    because of the way we would generate the method's name
+    (fDAssociate) the test thinks it's not implemented.
+    
+    
+    
+ 2024- 2- 20 Vincent Vanlaer <libvirt-e6954efa@volkihar.be>
+    
+    Fix memory leak in virStreamRecvFlags
+    virStreamRecvFlags allocates a temporary buffer to store the received
+    stream data in. This buffer was not freed on returns other than the
+    normal return with data.
+    
+    
+    
+ 2024- 1- 19 Daniel P. Berrangé <berrange@redhat.com>
+    
+    ci: refresh with latest 'lcitool manifest'
+    This refresh gets rid of the split jobs for prebuilt and local
+    container environments.
+    
+    
+    
+ 2024- 1- 15 Jiri Denemark <jdenemar@redhat.com>
+    
+    Post-release version bump to 10.1.0
+    
+    
  2024- 1- 8 Peter Krempa <pkrempa@redhat.com>
     
     ci: Install built module for testing insde an venv

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libvirt-python
-Version: 10.0.0
+Version: 10.2.0
 Summary: The libvirt virtualization API python binding
 Home-page: http://www.libvirt.org
 Maintainer: Libvirt Maintainers

libvirt-python-10.2.0/VERSION

@@ -0,0 +1 @@
+10.2.0

libvirt-python-10.0.0/ci/buildenv/centos-stream-9.sh → libvirt-python-10.2.0/ci/buildenv/centos-stream-8.sh

@@ -7,7 +7,8 @@
 function install_buildenv() {
     dnf distro-sync -y
     dnf install 'dnf-command(config-manager)' -y
-    dnf config-manager --set-enabled -y crb
+    dnf config-manager --set-enabled -y powertools
+    dnf install -y centos-release-advanced-virtualization
     dnf install -y epel-release
     dnf install -y epel-next-release
     dnf install -y \
@@ -26,6 +27,7 @@ function install_buildenv() {
         python3-setuptools \
         python3-wheel \
         rpm-build
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     rpm -qa | sort > /packages.txt
     mkdir -p /usr/libexec/ccache-wrappers
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc

libvirt-python-10.0.0/ci/buildenv/centos-stream-8.sh → libvirt-python-10.2.0/ci/buildenv/centos-stream-9.sh

@@ -7,8 +7,7 @@
 function install_buildenv() {
     dnf distro-sync -y
     dnf install 'dnf-command(config-manager)' -y
-    dnf config-manager --set-enabled -y powertools
-    dnf install -y centos-release-advanced-virtualization
+    dnf config-manager --set-enabled -y crb
     dnf install -y epel-release
     dnf install -y epel-next-release
     dnf install -y \
@@ -31,22 +30,22 @@ function install_buildenv() {
         make \
         meson \
         ninja-build \
-        perl \
+        perl-base \
         pkgconfig \
         python3 \
+        python3-build \
         python3-devel \
         python3-docutils \
         python3-lxml \
         python3-pip \
         python3-pytest \
         python3-setuptools \
-        python3-wheel \
         rpm-build
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     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 build
 }
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/buildenv/debian-sid.sh

@@ -26,6 +26,7 @@ function install_buildenv() {
             python3-venv
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
     dpkg-reconfigure locales
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     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

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/buildenv/fedora-38.sh

@@ -22,6 +22,7 @@ function install_buildenv() {
         python3-pytest \
         python3-setuptools \
         rpm-build
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     rpm -qa | sort > /packages.txt
     mkdir -p /usr/libexec/ccache-wrappers
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/buildenv/fedora-rawhide.sh

@@ -23,6 +23,7 @@ function install_buildenv() {
         python3-pytest \
         python3-setuptools \
         rpm-build
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     rpm -qa | sort > /packages.txt
     mkdir -p /usr/libexec/ccache-wrappers
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/buildenv/opensuse-leap-15.sh

@@ -22,6 +22,7 @@ function install_buildenv() {
            python3-setuptools \
            python3-wheel \
            rpm-build
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     rpm -qa | sort > /packages.txt
     mkdir -p /usr/libexec/ccache-wrappers
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/buildenv/opensuse-tumbleweed.sh

@@ -15,18 +15,18 @@ function install_buildenv() {
            libvirt-devel \
            pkgconfig \
            python3-base \
+           python3-build \
            python3-devel \
            python3-lxml \
            python3-pip \
            python3-pytest \
            python3-setuptools \
-           python3-wheel \
            rpm-build
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     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 build
 }
 
 export CCACHE_WRAPPERSDIR="/usr/libexec/ccache-wrappers"

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/buildenv/ubuntu-2004.sh

@@ -26,6 +26,7 @@ function install_buildenv() {
             python3-wheel
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
     dpkg-reconfigure locales
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     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

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/buildenv/ubuntu-2204.sh

@@ -26,6 +26,7 @@ function install_buildenv() {
             python3-wheel
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen
     dpkg-reconfigure locales
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED
     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

libvirt-python-10.0.0/ci/containers/centos-stream-9.Dockerfile → libvirt-python-10.2.0/ci/containers/centos-stream-8.Dockerfile

@@ -4,11 +4,12 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM quay.io/centos/centos:stream9
+FROM quay.io/centos/centos:stream8
 
 RUN dnf distro-sync -y && \
     dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y crb && \
+    dnf config-manager --set-enabled -y powertools && \
+    dnf install -y centos-release-advanced-virtualization && \
     dnf install -y epel-release && \
     dnf install -y epel-next-release && \
     dnf install -y \
@@ -29,6 +30,7 @@ RUN dnf distro-sync -y && \
         rpm-build && \
     dnf autoremove -y && \
     dnf clean all -y && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     rpm -qa | sort > /packages.txt && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

libvirt-python-10.0.0/ci/containers/centos-stream-8.Dockerfile → libvirt-python-10.2.0/ci/containers/centos-stream-9.Dockerfile

@@ -4,12 +4,11 @@
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM quay.io/centos/centos:stream8
+FROM quay.io/centos/centos:stream9
 
 RUN dnf distro-sync -y && \
     dnf install 'dnf-command(config-manager)' -y && \
-    dnf config-manager --set-enabled -y powertools && \
-    dnf install -y centos-release-advanced-virtualization && \
+    dnf config-manager --set-enabled -y crb && \
     dnf install -y epel-release && \
     dnf install -y epel-next-release && \
     dnf install -y \
@@ -32,26 +31,25 @@ RUN dnf distro-sync -y && \
         make \
         meson \
         ninja-build \
-        perl \
+        perl-base \
         pkgconfig \
         python3 \
+        python3-build \
         python3-devel \
         python3-docutils \
         python3-lxml \
         python3-pip \
         python3-pytest \
         python3-setuptools \
-        python3-wheel \
         rpm-build && \
     dnf autoremove -y && \
     dnf clean all -y && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     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 build
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV MAKE "/usr/bin/make"

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/containers/debian-sid.Dockerfile

@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     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 && \

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/containers/fedora-38.Dockerfile

@@ -35,6 +35,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                rpm-build && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     rpm -qa | sort > /packages.txt && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/containers/fedora-rawhide.Dockerfile

@@ -36,6 +36,7 @@ exec "$@"\n' > /usr/bin/nosync && \
                rpm-build && \
     nosync dnf autoremove -y && \
     nosync dnf clean all -y && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     rpm -qa | sort > /packages.txt && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/containers/opensuse-leap-15.Dockerfile

@@ -24,6 +24,7 @@ RUN zypper update -y && \
            python3-wheel \
            rpm-build && \
     zypper clean --all && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     rpm -qa | sort > /packages.txt && \
     mkdir -p /usr/libexec/ccache-wrappers && \
     ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/cc && \

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/containers/opensuse-tumbleweed.Dockerfile

@@ -16,21 +16,20 @@ RUN zypper dist-upgrade -y && \
            libvirt-devel \
            pkgconfig \
            python3-base \
+           python3-build \
            python3-devel \
            python3-lxml \
            python3-pip \
            python3-pytest \
            python3-setuptools \
-           python3-wheel \
            rpm-build && \
     zypper clean --all && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     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 build
-
 ENV CCACHE_WRAPPERSDIR "/usr/libexec/ccache-wrappers"
 ENV LANG "en_US.UTF-8"
 ENV PYTHON "/usr/bin/python3"

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/containers/ubuntu-2004.Dockerfile

@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     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 && \

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/ci/containers/ubuntu-2204.Dockerfile

@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     eatmydata apt-get autoclean -y && \
     sed -Ei 's,^# (en_US\.UTF-8 .*)$,\1,' /etc/locale.gen && \
     dpkg-reconfigure locales && \
+    rm -f /usr/lib*/python3*/EXTERNALLY-MANAGED && \
     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 && \

{libvirt-python-10.0.0 → libvirt-python-10.2.0}/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-python/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-python/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