.ansible-collection-microsoft-sql.metadata

@@ -1,2 +1,2 @@
-b0ee52fd3c4f8d57f2414bee6b1a944f9002b13f SOURCES/auto-maintenance-eadd06cfa98d244b096cff24cd11b668428b1613.tar.gz
+06bdf4fd47cd57661f657fa4f29ec3031198ba11 SOURCES/auto-maintenance-73800682a3293ef5ab5ed5880329ce792cd34bbf.tar.gz
-e8478bb22d373f545bb92ed83791b83c95fc29f7 SOURCES/mssql-2.2.3.tar.gz
+c6362ee857499ac6cc15d7f3b061d2a257c88f46 SOURCES/mssql-2.0.1.tar.gz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/auto-maintenance-eadd06cfa98d244b096cff24cd11b668428b1613.tar.gz
+SOURCES/auto-maintenance-73800682a3293ef5ab5ed5880329ce792cd34bbf.tar.gz
-SOURCES/mssql-2.2.3.tar.gz
+SOURCES/mssql-2.0.1.tar.gz

SPECS/ansible-collection-microsoft-sql.spec

@@ -11,11 +11,18 @@ BuildRequires: ansible-core >= 2.11.0
 
 %bcond_with collection_artifact
 
+# Do not convert .md to .html on RHEL 7 because pandoc is not available
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_without html
+%else
+%bcond_with html
+%endif
+
 Name: ansible-collection-microsoft-sql
 Url: https://github.com/linux-system-roles/mssql
 Summary: The Ansible collection for Microsoft SQL Server management
-Version: 2.2.3
+Version: 2.0.1
-Release: 2%{?dist}
+Release: 1%{?dist}
 
 License: MIT
 
@@ -47,7 +54,7 @@ Requires: rhel-system-roles
 Requires: linux-system-roles
 %endif
 
-%global mainid eadd06cfa98d244b096cff24cd11b668428b1613
+%global mainid 73800682a3293ef5ab5ed5880329ce792cd34bbf
 # Use either hash or tag for source1id
 # %%global source1id 50edba099ab2c8b25b225fe760cb5a459b320030
 %global source1id %{version}
@@ -60,15 +67,17 @@ Source1002: ansible-packaging.inc
 %include %{SOURCE1002}
 
 BuildArch: noarch
-# there is no ansible on i686, so when we get a builder that uses
+
-# this arch, the build fails with
+%if %{with html}
-# No matching package to install: 'ansible-core >= 2.11.0'
+# Requirements for md2html.sh to build the documentation
-# unfortunately, this causes the src rpm build tasks to be reported
+%if 0%{?fedora} || 0%{?rhel} >= 9
-# with the arch of the builder :-( which causes problems with internal
+BuildRequires: rubygem-kramdown-parser-gfm
-# test infrastructure - while we get those issues sorted out, revert
+%else
-# this change - this means that centpkg builds may fail and may have
+BuildRequires: pandoc
-# to be retried
+BuildRequires: asciidoc
-# ExcludeArch: i686
+BuildRequires: highlight
+%endif
+%endif
 
 # Requirements for galaxy_transform.py
 BuildRequires: python3
@@ -110,11 +119,14 @@ if [ -d %{rolename}/tests/roles ]; then
 fi
 
 %build
-# Move a hidden .README.html to a not hidden README.html
+%if %{with html}
-mv %{rolename}/.README.html %{rolename}/README.html
+# Convert README.md to README.html in the source roles
+sh md2html.sh -t %{rolename}/README.md
+%endif
 
 mkdir .collections
-
+# Copy README.md for the collection build
+cp %{rolename}/.collection/README.md lsr_role2collection/collection_readme.md
 # Copy galaxy.yml for the collection build
 cp %{rolename}/.collection/galaxy.yml ./
 
@@ -123,9 +135,9 @@ cp %{rolename}/.collection/galaxy.yml ./
 ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
                       "Ansible collection for Microsoft SQL Server management" \
                       "https://github.com/linux-system-roles/mssql" \
-                      "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/automating_system_administration_by_using_rhel_system_roles/assembly_configuring-microsoft-sql-server-using-microsoft-sql-server-ansible-role_automating-system-administration-by-using-rhel-system-roles" \
+                      "https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/administration_and_configuration_tasks_using_system_roles_in_rhel/assembly_configuring-microsoft-sql-server-using-microsoft-sql-server-ansible-role_assembly_updating-packages-to-enable-automation-for-the-rhel-system-roles" \
-                      "https://access.redhat.com/articles/3050101" \
+                      "https://github.com/linux-system-roles/mssql/blob/main/README.md" \
-                      "https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12332745&summary=Your%20request%20summary&issuetype=1&priority=10200&labels=Partner-Feature-Request&components=12377164" \
+                      "https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=ansible-collection-microsoft-sql" \
                       > galaxy.yml.tmp
 %else
 ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
@@ -147,7 +159,7 @@ python3 lsr_role2collection.py --role "%{rolename}" \
     --src-path "%{rolename}" \
     --src-owner linux-system-roles \
     --dest-path .collections \
-    --readme %{rolename}/.collection/README.md \
+    --readme lsr_role2collection/collection_readme.md \
     --namespace %{collection_namespace} \
     --collection %{collection_name} \
     --new-role "%{collection_rolename}" \
@@ -162,13 +174,13 @@ find .collections/ansible_collections/%{collection_namespace}/%{collection_name}
 rm -r .collections/ansible_collections/%{collection_namespace}/%{collection_name}/.[A-Za-z]*
 rm -r .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/%{collection_rolename}/.[A-Za-z]*
 
-# Copy CHANGELOG.md from collection role to parent collection dir
-cp .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/%{collection_rolename}/CHANGELOG.md \
-    .collections/ansible_collections/%{collection_namespace}/%{collection_name}
-
 # Copy galaxy.yml to the collection directory
 cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name}
 
+# Copy CHANGELOG.md from mssql to collection dir
+mv .collections/ansible_collections/%{collection_namespace}/%{collection_name}/roles/%{collection_rolename}/CHANGELOG.md \
+    .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
+
 # Build collection
 pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
 %ansible_collection_build
@@ -177,22 +189,21 @@ popd
 %install
 mkdir -p %{buildroot}%{ansible_roles_dir}
 
-# Step 1: Install the role in legacy format
 # Copy role in legacy format and rename rolename in tests
 cp -pR "%{rolename}" "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}"
 find %{buildroot}%{ansible_roles_dir}/%{legacy_rolename} -type f -exec \
-     sed -e "s/%{collection_namespace}\.%{collection_name}\.%{collection_rolename}/%{legacy_rolename}/g" \
+     sed -e "s/linux-system-roles\.%{rolename}/%{legacy_rolename}/g" \
          -i {} \;
 
-# Copy README, COPYING, CHANGELOG and LICENSE files to the corresponding directories
+# Copy README, COPYING, and LICENSE files to the corresponding directories
 mkdir -p %{buildroot}%{_pkglicensedir}
 mkdir -p "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
 ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.md" \
     "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
+%if %{with html}
 ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.html" \
     "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
-ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/CHANGELOG.md" \
+%endif
-    "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
 if [ -f "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" ]; then
     ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" \
         "%{buildroot}%{_pkglicensedir}/%{legacy_rolename}.COPYING"
@@ -206,33 +217,34 @@ fi
 rm -r %{buildroot}%{ansible_roles_dir}/*/.[A-Za-z]*
 rm -r %{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/tests/.[A-Za-z]*
 
-# Step 2: Remove molecule directory from all roles under ansible_roles_dir
+# Remove the molecule directory
 rm -r %{buildroot}%{ansible_roles_dir}/*/molecule
 
-# Step 3: Install the role in collection format
+# Install collection
 pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
 %ansible_collection_install
 popd
 
 mkdir -p %{buildroot}%{_pkgdocdir}/collection/roles
 
-# Link collection README to /usr/share/doc/ansible-collection-microsoft-sql/collection.
+# Copy the collection README files to the collection
 ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/README.md \
    %{buildroot}%{_pkgdocdir}/collection
 
-# Link role READMEs to /usr/share/doc/ansible-collection-microsoft-sql/collection/roles/server
+# Copy role's readme to /usr/share/doc/
-mkdir -p %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
+if [ -f "%{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.md" ]; then
-ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.md \
+    mkdir -p %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
-    %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
+    ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.md \
-ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.html \
         %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
+fi
 
-# Link role CHANGELOG.md to /usr/share/doc/ansible-collection-microsoft-sql/collection/roles/server
+%if %{with html}
-ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/CHANGELOG.md \
+# Convert README.md to README.html for collection in %%{buildroot}%%{_pkgdocdir}/collection
-    %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
+sh md2html.sh -t %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}/README.md
+%endif
 
-# Step 4: Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
 %if %{with collection_artifact}
+# Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
 pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
 if [ -f %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz ]; then
     mv %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz \
@@ -241,7 +253,7 @@ fi
 popd
 %endif
 
-# Step 5: Generate the %%files section in files_section.txt
+# Generate the %%files section in files_section.txt
 # Bulk files inclusion is not possible because roles store doc and licence
 # files together with other files
 format_item_for_files() {
@@ -321,43 +333,6 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 %endif
 
 %changelog
-* Thu Feb 27 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.3-2
-- Revert ExcludeArch: i686 due to TFT-2460
-  Resolves: RHEL-16342
-
-* Thu Feb 22 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.3-1
-- Add support for running SQL Server as a SELinux unconfined application with SELinux in enforcing mode on RHEL 9
-  Resolves: RHEL-16342
-- ExcludeArch: i686
-
-* Tue Feb 6 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.2-1
-- Update role to version 2.2.2 to fix HA
-  Resolves: RHEL-19201
-
-* Fri Feb 2 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.1-3
-- CHANGELOG.md was missing in some places
-- In legacy role, sed repalced unexpected strings at some places
-  Resolves: RHEL-23455
-
-* Wed Jan 31 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.1-2
-- Use latest auto-maintenance for updates in lsr_role2collection.py
-- Remove with_html, instead use built-in .README.html
-  Resolves: RHEL-23455
-
-* Mon Jan 29 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.2.1-1
-- Update role to version 2.2.1 to enhance running on EL 9
-  Resolves: RHEL-16342
-
-* Mon Dec 11 2023 Sergei Petrosian <spetrosi@redhat.com> - 2.2.0-1
-- Support installing SQL Server 2022 on RHEL 9 and running as a selinux-confined application
-  Resolves: RHEL-16342
-- Remove unnecessary variable and RPM requirements for read-scale clusters
-  Resolves: RHEL-3540
-- Add the mssql_ha_prep_for_pacemaker variable to configure SQL Server for Pacemaker
-  Resolves: RHEL-19091
-- Deprecate `mssql_ha_cluster_run_role` for `mssql_manage_ha_cluster`
-  Resolves: RHEL-19092
-
 * Thu Jul 27 2023 Sergei Petrosian <spetrosi@redhat.com> - 2.0.1-1
 - Update role to version 2.0.1 to enhance AD integration
   Resolves: RHEL-877
@@ -371,9 +346,6 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
 - Update role to version 1.4.1 to add customizable storage paths
   Resolves: RHEL-529
 
-* Thu Apr 13 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 1.3.0-3
-- Rebuilt for MSVSphere 9.2 beta
-
 * Thu Feb 23 2023 Sergei Petrosian <spetrosi@redhat.com> - 1.3.0-3
 - Spec: add functionality to build from a commit hash
 - Use latest 1.3.0 to add flexibility to AD integration functionality