Merge tag 'v4.1.0' into rel410

Release 4.1.0

.ansible-lint

@@ -7,5 +7,7 @@ enable_list:
 only_builtins_allow_collections:
   - redhat.satellite
 exclude_paths:
-  - changelogs/changelog.yml
+  - meta/runtime.yml
+  - plugins/inventory/foreman.py
   - tests/
+  - .github/

.github/ISSUE_TEMPLATE/bug_report.md

@@ -24,7 +24,7 @@ about: Create a report to help us improve
 ```
 
 ##### KATELLO/FOREMAN VERSION
-<!-- Paste, BELOW THIS COMMENT, verbatim output from "rpm -q tfm-rubygem-katello foreman"-->
+<!-- Paste, BELOW THIS COMMENT, verbatim output from "rpm -q rubygem-katello foreman"-->
 ```
 
 ```

.github/workflows/main.yml

@@ -19,13 +19,12 @@ jobs:
       fail-fast: false
       matrix:
         python:
-          - "3.10"
+          - "3.11"
         ansible:
-          - stable-2.12
-          - stable-2.13
           - stable-2.14
           - stable-2.15
           - stable-2.16
+          - stable-2.17
           - devel
         include:
           - python: "3.8"
@@ -37,14 +36,17 @@ jobs:
             container: "python:2.7"
           - python: "3.5"
             ansible: "stable-2.11"
+            container: "python:3.5"
           - python: "3.6"
             ansible: "stable-2.11"
           - python: "3.7"
             ansible: "stable-2.11"
           - python: "3.9"
             ansible: "stable-2.11"
-          - python: "3.11"
-            ansible: "devel"
+          - python: "3.10"
+            ansible: "stable-2.12"
+          - python: "3.10"
+            ansible: "stable-2.13"
           - python: "3.12"
             ansible: "devel"
     steps:

.github/workflows/release.yml

@@ -26,7 +26,7 @@ jobs:
       - name: Build Changelog
         run: antsibull-changelog generate --output release-changelog.txt --only-latest
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: redhat-satellite-*.tar.gz
           body_path: release-changelog.txt

.mailmap

@@ -31,3 +31,5 @@ Kenny Tordeurs <[email protected]> <[email protected]>
 Paul Armstrong <[email protected]> <[email protected]>
 Lukas Magauer <[email protected]> <[email protected]>
 Griffin Sullivan <[email protected]> <[email protected]>
+Griffin Sullivan <[email protected]> <[email protected]>
+Steffen Scheib <[email protected]> <[email protected]>

.yamllint

@@ -1,39 +1,6 @@
 ---
-# Based on ansible-lint config
-extends: default
-
 rules:
-  braces:
-    max-spaces-inside: 1
-    level: error
-  brackets:
-    max-spaces-inside: 1
-    level: error
-  colons:
-    max-spaces-after: -1
-    level: error
-  commas:
-    max-spaces-after: -1
-    level: error
-  comments: disable
-  comments-indentation: disable
-  document-start:
-    present: true
-  empty-lines:
-    max: 3
-    level: error
-
-  hyphens:
-    level: error
-  indentation: {spaces: 2, indent-sequences: consistent}
-  key-duplicates: enable
   line-length: disable
-  new-line-at-end-of-file: disable
-  new-lines:
-    type: unix
-  trailing-spaces: enable
-  truthy:
-    level: error
 
 ignore: |
   tests/test_playbooks/fixtures/

CHANGELOG.rst

@@ -6,6 +6,22 @@ redhat.satellite Release Notes
 
 This changelog describes changes after version 0.8.1.
 
+v4.1.0
+======
+
+Minor Changes
+-------------
+
+- redhat_manifest - report ``changed`` when manifest is regenerated and downloaded (https://github.com/theforeman/foreman-ansible-modules/issues/1473)
+
+New Modules
+-----------
+
+- redhat.satellite.content_import_info - List content imports
+- redhat.satellite.content_import_library - Manage library content imports
+- redhat.satellite.content_import_repository - Manage repository content imports
+- redhat.satellite.content_import_version - Manage content view version content imports
+
 v4.0.0
 ======
 
@@ -541,7 +557,6 @@ Release Summary
 
 Documentation fixes to reflect the correct module names.
 
-
 v1.0.0
 ======
 
@@ -550,7 +565,6 @@ Release Summary
 
 This is the first stable release of the ``redhat.satellite`` collection.
 
-
 Breaking Changes / Porting Guide
 --------------------------------
 

Makefile

@@ -8,7 +8,7 @@ ROLES := $(wildcard roles/*)
 PLUGIN_TYPES := $(filter-out __%,$(notdir $(wildcard plugins/*)))
 RUNTIME_YML := meta/runtime.yml
 METADATA := galaxy.yml LICENSE README.md $(RUNTIME_YML) requirements.txt changelogs/changelog.yaml CHANGELOG.rst bindep.txt PSF-license.txt meta/execution-environment.yml
-TESTDATA := Makefile pytest.ini $(shell find tests/ ! -type d ! -path '*/__pycache__/*' ! -path '*/test_playbooks/fixtures/*' ! -path '*/fixtures/apidoc/*')
+TESTDATA := .ansible-lint Makefile pytest.ini $(shell find tests/ ! -type d ! -path '*/__pycache__/*' ! -path '*/test_playbooks/fixtures/*' ! -path '*/fixtures/apidoc/*')
 $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(eval _$(PLUGIN_TYPE) := $(filter-out %__init__.py,$(wildcard plugins/$(PLUGIN_TYPE)/*.py)) $(wildcard plugins/$(PLUGIN_TYPE)/*.yml)))
 DEPENDENCIES := $(METADATA) $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(_$(PLUGIN_TYPE))) $(foreach ROLE,$(ROLES),$(wildcard $(ROLE)/*/*)) $(foreach ROLE,$(ROLES),$(ROLE)/README.md) $(TESTDATA)
 
@@ -46,7 +46,7 @@ info:
 
 lint: $(MANIFEST) $(RUNTIME_YML) | tests/test_playbooks/vars/server.yml
 	yamllint -f parsable tests/test_playbooks roles
-	ansible-lint -v --offline roles/*
+	ansible-lint -v --offline
 	ansible-playbook --syntax-check tests/test_playbooks/*.yml | grep -v '^$$'
 	flake8 --ignore=E402,W503 --max-line-length=160 plugins/ tests/
 	@echo "Check that there are no changes to $(RUNTIME_YML)"