Sync changes to SLFO-1.2 branch

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="manual">
     <param name="filename">containerized-data-importer</param>
-    <param name="revision">v1.62.0</param>
+    <param name="revision">v1.60.1</param>
     <param name="scm">git</param>
     <param name="submodules">disable</param>
     <param name="url">https://github.com/kubevirt/containerized-data-importer</param>

cdi_containers_meta

@@ -22,15 +22,3 @@ if [ -n "${pkg}" ]; then
         PKG_RELEASE=$(rpm -qp --queryformat=%{release} ${_pkg})
     fi
 fi
-
-case "${DISTRO}" in
-*:0)
-    SUPPORT_LEVEL=l3
-    if [[ "$(uname -m)" != x86_64 ]]; then
-        SUPPORT_LEVEL=techpreview
-    fi
-    ;;
-*:1)
-    SUPPORT_LEVEL=unsupported
-    ;;
-esac

containerized-data-importer-1.62.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eab0d2099cbe727995c0a91ad1a0efa602a7d40f9201b320fb2dc4a81f4cd2ef
-size 224836335

containerized-data-importer.changes

@@ -1,44 +1,24 @@
 -------------------------------------------------------------------
-Wed Apr 23 04:19:41 UTC 2025 - Caleb Crane <caleb.crane@suse.com>
-
-- Update to version 1.62.0
-  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.62.0
-
--------------------------------------------------------------------
-Sat Jan 18 01:59:12 UTC 2025 - Caleb Crane <caleb.crane@suse.com>
-
-- Update to version 1.61.0
-  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.61.0
-
--------------------------------------------------------------------
-Tue Oct 15 05:49:47 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
-
-- Enable aarch64 build for SLE and mark it as techpreview (jsc#PED-10545)
-
--------------------------------------------------------------------
-Fri Sep 13 11:27:16 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
-
-- Update to version 1.60.3
-  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.60.3
-
--------------------------------------------------------------------
-Fri Aug 30 07:17:57 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
-
-- Update to version 1.60.2
-  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.60.2
-
--------------------------------------------------------------------
-Mon Aug 19 07:45:49 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+Fri Sep  6 07:22:11 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 
 - Update to version 1.60.1
   Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.60.1
 - Drop upstreamed patch
   0001-Bump-github.com-containers-image-v5-to-v5.30.1.patch
+- Add registry path for SLE15 SP7
+- Bump to the latest tag 1.60.1-150600.3.9.1
 
 -------------------------------------------------------------------
-Fri Jul 19 07:42:25 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+Wed Jul 31 07:16:14 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 
-- Add registry path for SLE15 SP7
+- Use the images based on SLE15 SP6 BCI: 1.59.0-150600.3.6.1
+
+-------------------------------------------------------------------
+Mon Jul  8 06:45:02 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+
+- Update to version 1.59.0
+  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.59.0
+  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.58.1
 
 -------------------------------------------------------------------
 Tue May 14 11:19:43 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
@@ -47,16 +27,10 @@ Tue May 14 11:19:43 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
   0001-Bump-github.com-containers-image-v5-to-v5.30.1.patch
 
 -------------------------------------------------------------------
-Wed Apr  3 07:53:06 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
+Mon Feb 12 08:50:24 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
 
-- Update to version 1.59.0
-  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.59.0
-
--------------------------------------------------------------------
-Wed Feb 21 12:29:50 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>
-
-- Update to version 1.58.1
-  Release notes https://github.com/kubevirt/containerized-data-importer/releases/tag/v1.58.1
+- Overwrite container image references in the manifests: use the images
+  based on SLE15 SP5 BCI
 
 -------------------------------------------------------------------
 Wed Jan  3 09:54:01 UTC 2024 - Vasily Ulyanov <vasily.ulyanov@suse.com>

containerized-data-importer.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package containerized-data-importer
 #
-# Copyright (c) 2025 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 %if 0%{?sle_version} && !0%{?is_opensuse}
 # SLE
-%define _exclusive_arch x86_64 aarch64
+%define _exclusive_arch x86_64
 %else
 %if 0%{?suse_version} == 1600
 # ALP
@@ -30,7 +30,7 @@
 %endif
 
 Name:           containerized-data-importer
-Version:        1.62.0
+Version:        1.60.1
 Release:        0
 Summary:        Container native virtualization
 License:        Apache-2.0
@@ -221,7 +221,11 @@ CGO_ENABLED=0 ./hack/build/build-go.sh build \
     tools/cdi-containerimage-server \
     %{nil}
 
-env DOCKER_PREFIX=$reg_path DOCKER_TAG=%{version}-%{release} ./hack/build/build-manifests.sh
+# Note: the generated manifests will point to the images based on SLE15 SP6 BCI.
+env \
+DOCKER_PREFIX=registry.suse.com/suse/sles/15.6 \
+DOCKER_TAG=1.60.1-150600.3.9.1 \
+./hack/build/build-manifests.sh
 
 %install
 mkdir -p %{buildroot}%{_bindir}