Compare commits

...

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

@ -1,2 +1,2 @@
06bdf4fd47cd57661f657fa4f29ec3031198ba11 SOURCES/auto-maintenance-73800682a3293ef5ab5ed5880329ce792cd34bbf.tar.gz 6102040190e8d6aaf89d24348e1e030ea944ec4a SOURCES/auto-maintenance-e92f7e4b3a9d09f75c3bfc257705506562083336.tar.gz
c6362ee857499ac6cc15d7f3b061d2a257c88f46 SOURCES/mssql-2.0.1.tar.gz f1c485bf296f1cb960287f9b2fadfb11565db471 SOURCES/mssql-2.5.2.tar.gz

4
.gitignore vendored

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

@ -11,17 +11,10 @@ BuildRequires: ansible-core >= 2.11.0
%bcond_with collection_artifact %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 Name: ansible-collection-microsoft-sql
Url: https://github.com/linux-system-roles/mssql Url: https://github.com/linux-system-roles/mssql
Summary: The Ansible collection for Microsoft SQL Server management Summary: The Ansible collection for Microsoft SQL Server management
Version: 2.0.1 Version: 2.5.2
Release: 1%{?dist} Release: 1%{?dist}
License: MIT License: MIT
@ -54,7 +47,7 @@ Requires: rhel-system-roles
Requires: linux-system-roles Requires: linux-system-roles
%endif %endif
%global mainid 73800682a3293ef5ab5ed5880329ce792cd34bbf %global mainid e92f7e4b3a9d09f75c3bfc257705506562083336
# Use either hash or tag for source1id # Use either hash or tag for source1id
# %%global source1id 50edba099ab2c8b25b225fe760cb5a459b320030 # %%global source1id 50edba099ab2c8b25b225fe760cb5a459b320030
%global source1id %{version} %global source1id %{version}
@ -67,17 +60,15 @@ Source1002: ansible-packaging.inc
%include %{SOURCE1002} %include %{SOURCE1002}
BuildArch: noarch BuildArch: noarch
# there is no ansible on i686, so when we get a builder that uses
%if %{with html} # this arch, the build fails with
# Requirements for md2html.sh to build the documentation # No matching package to install: 'ansible-core >= 2.11.0'
%if 0%{?fedora} || 0%{?rhel} >= 9 # unfortunately, this causes the src rpm build tasks to be reported
BuildRequires: rubygem-kramdown-parser-gfm # with the arch of the builder :-( which causes problems with internal
%else # test infrastructure - while we get those issues sorted out, revert
BuildRequires: pandoc # this change - this means that centpkg builds may fail and may have
BuildRequires: asciidoc # to be retried
BuildRequires: highlight # ExcludeArch: i686
%endif
%endif
# Requirements for galaxy_transform.py # Requirements for galaxy_transform.py
BuildRequires: python3 BuildRequires: python3
@ -119,14 +110,11 @@ if [ -d %{rolename}/tests/roles ]; then
fi fi
%build %build
%if %{with html} # Move a hidden .README.html to a not hidden README.html
# Convert README.md to README.html in the source roles mv %{rolename}/.README.html %{rolename}/README.html
sh md2html.sh -t %{rolename}/README.md
%endif
mkdir .collections 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 # Copy galaxy.yml for the collection build
cp %{rolename}/.collection/galaxy.yml ./ cp %{rolename}/.collection/galaxy.yml ./
@ -135,9 +123,9 @@ cp %{rolename}/.collection/galaxy.yml ./
./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \ ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
"Ansible collection for Microsoft SQL Server management" \ "Ansible collection for Microsoft SQL Server management" \
"https://github.com/linux-system-roles/mssql" \ "https://github.com/linux-system-roles/mssql" \
"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/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://github.com/linux-system-roles/mssql/blob/main/README.md" \ "https://access.redhat.com/articles/3050101" \
"https://bugzilla.redhat.com/enter_bug.cgi?product=Red%20Hat%20Enterprise%20Linux%208&component=ansible-collection-microsoft-sql" \ "https://issues.redhat.com/secure/CreateIssueDetails!init.jspa?pid=12332745&summary=Your%20request%20summary&issuetype=1&priority=10200&labels=Partner-Feature-Request&components=12377164" \
> galaxy.yml.tmp > galaxy.yml.tmp
%else %else
./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \ ./galaxy_transform.py "%{collection_namespace}" "%{collection_name}" "%{collection_version}" \
@ -159,7 +147,7 @@ python3 lsr_role2collection.py --role "%{rolename}" \
--src-path "%{rolename}" \ --src-path "%{rolename}" \
--src-owner linux-system-roles \ --src-owner linux-system-roles \
--dest-path .collections \ --dest-path .collections \
--readme lsr_role2collection/collection_readme.md \ --readme %{rolename}/.collection/README.md \
--namespace %{collection_namespace} \ --namespace %{collection_namespace} \
--collection %{collection_name} \ --collection %{collection_name} \
--new-role "%{collection_rolename}" \ --new-role "%{collection_rolename}" \
@ -174,13 +162,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}/.[A-Za-z]*
rm -r .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/%{collection_rolename}/.[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 # Copy galaxy.yml to the collection directory
cp -p galaxy.yml .collections/ansible_collections/%{collection_namespace}/%{collection_name} 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 # Build collection
pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
%ansible_collection_build %ansible_collection_build
@ -189,21 +177,22 @@ popd
%install %install
mkdir -p %{buildroot}%{ansible_roles_dir} mkdir -p %{buildroot}%{ansible_roles_dir}
# Step 1: Install the role in legacy format
# Copy role in legacy format and rename rolename in tests # Copy role in legacy format and rename rolename in tests
cp -pR "%{rolename}" "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}" cp -pR "%{rolename}" "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}"
find %{buildroot}%{ansible_roles_dir}/%{legacy_rolename} -type f -exec \ find %{buildroot}%{ansible_roles_dir}/%{legacy_rolename} -type f -exec \
sed -e "s/linux-system-roles\.%{rolename}/%{legacy_rolename}/g" \ sed -e "s/%{collection_namespace}\.%{collection_name}\.%{collection_rolename}/%{legacy_rolename}/g" \
-i {} \; -i {} \;
# Copy README, COPYING, and LICENSE files to the corresponding directories # Copy README, COPYING, CHANGELOG and LICENSE files to the corresponding directories
mkdir -p %{buildroot}%{_pkglicensedir} mkdir -p %{buildroot}%{_pkglicensedir}
mkdir -p "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}" mkdir -p "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.md" \ ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.md" \
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}" "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
%if %{with html}
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.html" \ ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/README.html" \
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}" "%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
%endif ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/CHANGELOG.md" \
"%{buildroot}%{_pkgdocdir}/%{legacy_rolename}"
if [ -f "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" ]; then if [ -f "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" ]; then
ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" \ ln -sr "%{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/COPYING" \
"%{buildroot}%{_pkglicensedir}/%{legacy_rolename}.COPYING" "%{buildroot}%{_pkglicensedir}/%{legacy_rolename}.COPYING"
@ -217,34 +206,33 @@ fi
rm -r %{buildroot}%{ansible_roles_dir}/*/.[A-Za-z]* rm -r %{buildroot}%{ansible_roles_dir}/*/.[A-Za-z]*
rm -r %{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/tests/.[A-Za-z]* rm -r %{buildroot}%{ansible_roles_dir}/%{legacy_rolename}/tests/.[A-Za-z]*
# Remove the molecule directory # Step 2: Remove molecule directory from all roles under ansible_roles_dir
rm -r %{buildroot}%{ansible_roles_dir}/*/molecule rm -r %{buildroot}%{ansible_roles_dir}/*/molecule
# Install collection # Step 3: Install the role in collection format
pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/ pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
%ansible_collection_install %ansible_collection_install
popd popd
mkdir -p %{buildroot}%{_pkgdocdir}/collection/roles mkdir -p %{buildroot}%{_pkgdocdir}/collection/roles
# Copy the collection README files to the collection # Link collection README to /usr/share/doc/ansible-collection-microsoft-sql/collection.
ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/README.md \ ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/README.md \
%{buildroot}%{_pkgdocdir}/collection %{buildroot}%{_pkgdocdir}/collection
# Copy role's readme to /usr/share/doc/ # Link role READMEs to /usr/share/doc/ansible-collection-microsoft-sql/collection/roles/server
if [ -f "%{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.md" ]; then mkdir -p %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
mkdir -p %{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.md \ %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
%{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename} ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/README.html \
fi %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
%if %{with html} # Link role CHANGELOG.md to /usr/share/doc/ansible-collection-microsoft-sql/collection/roles/server
# Convert README.md to README.html for collection in %%{buildroot}%%{_pkgdocdir}/collection ln -sr %{buildroot}%{ansible_collection_files}%{collection_name}/roles/%{collection_rolename}/CHANGELOG.md \
sh md2html.sh -t %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}/README.md %{buildroot}%{_pkgdocdir}/collection/roles/%{collection_rolename}
%endif
# Step 4: Copy collection artifact to /usr/share/ansible/collections/ for collection-artifact
%if %{with 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}/ pushd .collections/ansible_collections/%{collection_namespace}/%{collection_name}/
if [ -f %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz ]; then if [ -f %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz ]; then
mv %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz \ mv %{collection_namespace}-%{collection_name}-%{collection_version}.tar.gz \
@ -253,7 +241,7 @@ fi
popd popd
%endif %endif
# Generate the %%files section in files_section.txt # Step 5: Generate the %%files section in files_section.txt
# Bulk files inclusion is not possible because roles store doc and licence # Bulk files inclusion is not possible because roles store doc and licence
# files together with other files # files together with other files
format_item_for_files() { format_item_for_files() {
@ -333,6 +321,62 @@ find %{buildroot}%{ansible_roles_dir} -mindepth 1 -maxdepth 1 | \
%endif %endif
%changelog %changelog
* Wed Nov 20 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.5.2-1
- Use new adutil functionality to enable AES encryption
Resolves: RHEL-68490
- Add mssql_tools_versions, mssql_tls_self_sign to allow installing different versions of mssql-tools
Resolves: RHEL-68468
- Deprecate mssql_accept_microsoft_odbc_driver_17_for_sql_server_eula
Resolves: RHEL-69315
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com>
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Thu Aug 15 2024 Sergei Petrosian <spetrosi@redhat.com> - 2.3.1-1
- Add new version to RHEL 10
Resolves: RHEL-34575
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com>
- Bump release for June 2024 mass rebuild
* Tue 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 * Thu Jul 27 2023 Sergei Petrosian <spetrosi@redhat.com> - 2.0.1-1
- Update role to version 2.0.1 to enhance AD integration - Update role to version 2.0.1 to enhance AD integration
Resolves: RHEL-877 Resolves: RHEL-877

Loading…
Cancel
Save