Merge pull request #138 from yuravk/devel-ng-0.22.0

Exclude microsoft vendor from the package

Author: andrewlukoshko

.github/workflows/elevate.yml

@@ -588,7 +588,7 @@ jobs:
         sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh docker ${{ env.source_release }}" || exit 1
 
     - name: Vendor - Microsoft
-      if: inputs.vendors == 'all' && env.target_release != '10'
+      if: false && inputs.vendors == 'all' && env.target_release != '10'
       run: |
         sudo vagrant ssh elevatevm -c "sudo /vagrant/Vendors.sh microsoft ${{ env.source_release }}" || exit 1
 

leapp-data.spec

@@ -6,7 +6,7 @@
 %define conflict_dists() %(for i in almalinux almalinux-kitten centos oraclelinux rocky; do if [ "${i}" != "%{dist_name}" ]; then echo -n "leapp-data-${i} "; fi; done)
 
 %if 0%{?rhel} == 7
-%define supported_vendors epel imunify kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce microsoft imunify360-alt-php
+%define supported_vendors epel imunify kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce imunify360-alt-php
 %define target_version 8
 %if %{dist_name} == "almalinux"
 %define gpg_key RPM-GPG-KEY-AlmaLinux-8
@@ -22,7 +22,7 @@
 %endif
 %endif
 %if 0%{?rhel} == 8
-%define supported_vendors epel kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce microsoft
+%define supported_vendors epel kernelcare mariadb nginx-stable nginx-mainline postgresql docker-ce
 %define target_version 9
 %if %{dist_name} == "almalinux"
 %define gpg_key RPM-GPG-KEY-AlmaLinux-9
@@ -55,7 +55,7 @@
 
 Name:		leapp-data-%{dist_name}
 Version:	0.8
-Release:	2%{?dist}.%{pes_events_build_date}
+Release:	3%{?dist}.%{pes_events_build_date}
 Summary:	data for migrating tool
 Group:		Applications/Databases
 License:	ASL 2.0
@@ -180,6 +180,9 @@ python3 tests/check_debranding.py %{buildroot}%{_sysconfdir}/leapp/files/pes-eve
 
 
 %changelog
+* Fri Mar 28 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.8-3.20250228
+- Exclude microsoft vendor from the package
+
 * Thu Mar 27 2025 Yuriy Kohut <ykohut@almalinux.org> - 0.8-2.20250228
 - Update pes-events.json and config.json (except almalinux-kitten, centos):
  - solve valgrind-docs, valgrind-scripts with valgrind package conflicts during 8to9 upgrade