diff --git a/.gitignore b/.gitignore index 8a08a7f..b1e35f9 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,6 @@ /tlog-103d3996436c98dccf89e645378e76bd9add2abb.tar.gz /vpn-73e8f5e3b514a8e7a3637dc204d5c106adddeea7.tar.gz /postfix-bbf5784849d362cc3443fde8b09da26ea698a8ce.tar.gz +/auto-maintenance-91146cd0893ff0acb7e86990f553f590214c6892.tar.gz +/auto-maintenance-963446f9ec1da3070b5c463bd9f5e7df686caf00.tar.gz +/auto-maintenance-78fcd6f82472d65466ad92b171f073e77bc16c9f.tar.gz diff --git a/linux-system-roles.spec b/linux-system-roles.spec index 5a11d6a..34bc3e7 100644 --- a/linux-system-roles.spec +++ b/linux-system-roles.spec @@ -166,7 +166,7 @@ BuildRequires: ansible >= 2.9.10 %defcommit 18 73e8f5e3b514a8e7a3637dc204d5c106adddeea7 %global rolename18 vpn -%global mainid e9e30b03c0fe9387cb0ea8a5e7aac8313de2deef +%global mainid 78fcd6f82472d65466ad92b171f073e77bc16c9f Source: %{url}auto-maintenance/archive/%{mainid}/auto-maintenance-%{mainid}.tar.gz Source1: %{archiveurl1} Source2: %{archiveurl2} @@ -332,6 +332,16 @@ for role in %{rolenames}; do --namespace %{collection_namespace} --collection %{collection_name} done +# copy requirements.txt and bindep.txt from auto-maintenance/lsr_role2collection +if [ -f lsr_role2collection/collection_requirements.txt ]; then + cp lsr_role2collection/collection_requirements.txt \ + .collections/ansible_collections/%{collection_namespace}/%{collection_name}/requirements.txt +fi +if [ -f lsr_role2collection/collection_bindep.txt ]; then + cp lsr_role2collection/collection_bindep.txt \ + .collections/ansible_collections/%{collection_namespace}/%{collection_name}/bindep.txt +fi + rm -f .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/sanity/ignore-2.9.txt # Merge .sanity-ansible-ignore-2.9-ROLENAME.txt into tests/sanity/ignore-2.9.txt mkdir -p .collections/ansible_collections/%{collection_namespace}/%{collection_name}/tests/sanity diff --git a/sources b/sources index c3f82f1..c1d64b2 100644 --- a/sources +++ b/sources @@ -13,7 +13,7 @@ SHA512 (nbde_server-4dfc5e2aca74cb82f2a50eec7e975a2b78ad9678.tar.gz) = 021052bde SHA512 (certificate-23f1a414ab022a506614c5be8eadf1708dc45b2b.tar.gz) = d8c1fb1716e5ace484a58a754c14be2212b34bf88c72b430188694226f214f16e14d418fc5dc4926edee21aa363b1515083c02bbc4e23fd35c2ef23214f7d7ae SHA512 (crypto_policies-ff335b87017954c0b47bfe818700e0f1600b04db.tar.gz) = d4439d339278878f534466848e54ff6d2901e9c1a7924d5f3450c06439ec92c3fbaa838b6036da88c5654fd8f350edf18322b409c2d5acb09076fcfd444efbf6 SHA512 (ansible-sshd-428d390668077f0baf5e88c5834ee810ae11113c.tar.gz) = 55ce34bbade1e0fb75cc8443995233a32ac9474ba8411a94fd90d808ff9da1dc188ad5a790472ab301324c7147ba49f614bef59d0a254e43570a1462c0b5b8ec -SHA512 (auto-maintenance-e9e30b03c0fe9387cb0ea8a5e7aac8313de2deef.tar.gz) = b2f623e5982a823bfc11c7f619162ae2c4a03ae0a7ffcbdcb92cb81a5159825f6279c6cb6360ddb187d916280fd57556b1b46557fade1524926f099b532fc05d SHA512 (ssh-54bec0855966cc3eed65b26a7c90962eb103d66d.tar.gz) = 19c0dcf2eea24a1ff8cbc8795f6f751e8b98927d274a47fca82b06586992140a0cfa892750e935ac159391d2863aee17ed58dec69fae134c842250dea9658f08 SHA512 (ha_cluster-d97f48a21002497e1ac1bd1385841f2939d7b840.tar.gz) = c931ae0e51b32cb002453da6da2ebb37396c70253c40d51800c66fd0b109a4ae37649fbeaaa09533573a9856f582a3b0ff46373bd55c03ebdd7b219af95a0899 SHA512 (vpn-73e8f5e3b514a8e7a3637dc204d5c106adddeea7.tar.gz) = 266f41983def6bd2bb4940b4f54740f225129229f423ef62c1f625900c7c59407538e41c8cd212be2ea909e8b91b21596e2e871995545685f6233f6d27398416 +SHA512 (auto-maintenance-78fcd6f82472d65466ad92b171f073e77bc16c9f.tar.gz) = 93910660a2fc5a2e0dbe15f905e062890268adef144afbcfa35024cf1fb004ea884514f814af3a592f8a86f10977535acdc04040d7e8822ee1ccf5902691ce3e