Merge pull request #63 from RedHatSatellite/rel3110

Release 3.11.0

.ansible-lint

@@ -1,4 +1,7 @@
 ---
+skip_list:
+  - var-naming[no-role-prefix]
+var_naming_pattern: "^(__)?satellite_[a-z_][a-z0-9_]*$"
 enable_list:
   - only-builtins
 only_builtins_allow_collections:

.github/workflows/codeql-analysis.yml

@@ -10,6 +10,10 @@ on:
   schedule:
     - cron: '0 6 * * 4'
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   analyze:
     name: Analyze

.github/workflows/docs.yml

@@ -7,6 +7,10 @@ on:
     branches:
       - develop
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   docs:
     runs-on: ubuntu-latest

.github/workflows/main.yml

@@ -7,6 +7,10 @@ env:
   TERM: 'xterm-256color'
   PYTEST_ADDOPTS: '--color=yes'
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   build:
     runs-on: ubuntu-20.04
@@ -20,6 +24,7 @@ jobs:
           - stable-2.12
           - stable-2.13
           - stable-2.14
+          - stable-2.15
           - devel
         include:
           - python: "3.8"

.github/workflows/release.yml

@@ -5,6 +5,10 @@ on:
     branches-ignore:
       - '**'
 
+concurrency:
+  group: ${{ github.ref_name }}-${{ github.workflow }}
+  cancel-in-progress: true
+
 jobs:
   release:
     runs-on: ubuntu-latest

CHANGELOG.rst

@@ -6,6 +6,26 @@ redhat.satellite Release Notes
 
 This changelog describes changes after version 0.8.1.
 
+v3.11.0
+=======
+
+Minor Changes
+-------------
+
+- content_view_promote role - also accept all parameters of the `content_view_version` module (https://github.com/theforeman/foreman-ansible-modules/issues/1591)
+- content_view_version - include information about the published version in the return value of the module
+- job-invocation - add ``recurrence purpose`` and ``description_format`` parameters
+- organizations role - accept ``parameters`` and ``ignore_types`` like the module does
+
+Bugfixes
+--------
+
+- compute_profile, host - properly support nested VMware clusters (https://bugzilla.redhat.com/show_bug.cgi?id=2211394)
+- content_credential - don't require ``content_type`` and ``content`` parameters when removing credentials (https://github.com/theforeman/foreman-ansible-modules/issues/1588)
+- content_credentials role - don't require ``content_type`` and ``content`` parameters when removing credentials
+- content_view_filter - don't fail when creating a modulemd filter (https://github.com/theforeman/foreman-ansible-modules/issues/1608, https://bugzilla.redhat.com/show_bug.cgi?id=2208557)
+- repositories role - don't log repository information when creating products (https://bugzilla.redhat.com/show_bug.cgi?id=2183357)
+
 v3.10.0
 =======
 

Makefile

@@ -8,8 +8,9 @@ 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/*')
 $(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)
+DEPENDENCIES := $(METADATA) $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES),$(_$(PLUGIN_TYPE))) $(foreach ROLE,$(ROLES),$(wildcard $(ROLE)/*/*)) $(foreach ROLE,$(ROLES),$(ROLE)/README.md) $(TESTDATA)
 
 PYTHON_VERSION = $(shell $(PYTHON_COMMAND) -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')
 ANSIBLE_SUPPORTS_REDIRECTS = $(shell ansible --version | grep -q 'ansible 2.9' && echo 0 || echo 1)
@@ -19,7 +20,7 @@ TEST =
 FLAGS =
 PYTEST = pytest -n 4 --forked -vv
 
-APIPIE_VERSION ?= v0.3.2
+APIPIE_VERSION ?= v0.4.0
 
 default: help
 help:
@@ -40,12 +41,12 @@ help:
 
 info:
 	@echo "Building collection $(NAMESPACE)-$(NAME)-$(VERSION)"
-	@echo "  roles:\n $(foreach ROLE,$(notdir $(ROLES)),   - $(ROLE)\n)"
-	@echo " $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES), $(PLUGIN_TYPE):\n $(foreach PLUGIN,$(basename $(notdir $(_$(PLUGIN_TYPE)))),   - $(PLUGIN)\n)\n)"
+	@echo -e "  roles:\n $(foreach ROLE,$(notdir $(ROLES)),   - $(ROLE)\n)"
+	@echo -e " $(foreach PLUGIN_TYPE,$(PLUGIN_TYPES), $(PLUGIN_TYPE):\n $(foreach PLUGIN,$(basename $(notdir $(_$(PLUGIN_TYPE)))),   - $(PLUGIN)\n)\n)"
 
 lint: $(MANIFEST) $(RUNTIME_YML) | tests/test_playbooks/vars/server.yml
 	yamllint -f parsable tests/test_playbooks roles
-	ansible-lint -v roles/*
+	ansible-lint -v --offline roles/*
 	ansible-playbook --syntax-check tests/test_playbooks/*.yml | grep -v '^$$'
 	flake8 --ignore=E402,W503 --max-line-length=160 plugins/ tests/
 	GALAXY_IMPORTER_CONFIG=tests/galaxy-importer.cfg python -m galaxy_importer.main $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz
@@ -87,7 +88,7 @@ clean_%: FORCE $(MANIFEST)
 setup: test-setup
 
 test-setup: | tests/test_playbooks/vars/server.yml
-	pip install --upgrade pip
+	pip install --upgrade --force-reinstall 'pip<23.1'
 	pip install --upgrade -r requirements-dev.txt
 
 tests/test_playbooks/vars/server.yml:
@@ -108,6 +109,9 @@ $(MANIFEST): $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz
 build/src/%: %
 	install -m 644 -DT $< $@
 
+build/src/tests/test_%.py: FORCE
+	install -m 644 -DT tests/test_$*.py $@
+
 $(NAMESPACE)-$(NAME)-$(VERSION).tar.gz: $(addprefix build/src/,$(DEPENDENCIES))
 	ansible-galaxy collection build build/src --force
 
@@ -150,7 +154,7 @@ branding:
 	sed -i 's#theforeman.github.io/foreman-ansible-modules#redhatsatellite.github.io/satellite-ansible-collection#g' roles/*/README.md
 	sed -i '/foreman_\w.*:/ s/foreman_/satellite_/g' tests/test_playbooks/*_role.yml tests/test_playbooks/convert2rhel.yml docs/cvmanager.md
 	sed -i 's/foreman:/satellite:/' $(RUNTIME_YML)
-	sed -i 's/foreman/satellite/' generate_action_groups.py
+	sed -i 's/foreman/satellite/' generate_action_groups.py .ansible-lint
 	sed -i '/group/ s/foreman/satellite/' tests/test_playbooks/module_defaults.yml
 	rm -rf tests/test_playbooks/scc_* tests/test_playbooks/tasks/scc_* tests/test_playbooks/fixtures/scc_* plugins/modules/scc_*.py tests/fixtures/apidoc/scc_*.json
 	rm -rf tests/test_playbooks/snapshot* tests/test_playbooks/tasks/snapshot* tests/test_playbooks/fixtures/snapshot* plugins/modules/snapshot*.py tests/fixtures/apidoc/snapshot*.json

changelogs/changelog.yaml

@@ -572,6 +572,36 @@ releases:
     - bz2183357-role-log.yml
     - content-export-format.yml
     release_date: '2023-04-04'
+  3.11.0:
+    changes:
+      bugfixes:
+      - compute_profile, host - properly support nested VMware clusters (https://bugzilla.redhat.com/show_bug.cgi?id=2211394)
+      - content_credential - don't require ``content_type`` and ``content`` parameters
+        when removing credentials (https://github.com/theforeman/foreman-ansible-modules/issues/1588)
+      - content_credentials role - don't require ``content_type`` and ``content``
+        parameters when removing credentials
+      - content_view_filter - don't fail when creating a modulemd filter (https://github.com/theforeman/foreman-ansible-modules/issues/1608,
+        https://bugzilla.redhat.com/show_bug.cgi?id=2208557)
+      - repositories role - don't log repository information when creating products
+        (https://bugzilla.redhat.com/show_bug.cgi?id=2183357)
+      minor_changes:
+      - content_view_promote role - also accept all parameters of the `content_view_version`
+        module (https://github.com/theforeman/foreman-ansible-modules/issues/1591)
+      - content_view_version - include information about the published version in
+        the return value of the module
+      - job-invocation - add ``recurrence purpose`` and ``description_format`` parameters
+      - organizations role - accept ``parameters`` and ``ignore_types`` like the module
+        does
+    fragments:
+    - 1588-content_credential-absent.yml
+    - 1591-cv-promote-parameters.yml
+    - 1608-cv-filter-modulemd.yml
+    - bz2183357-do_not_log_repositories_for_products.yml
+    - bz2211394-nested-vmware-clusters.yml
+    - content_view_version-return_value.yml
+    - job-invocation-parameters.yml
+    - organizations_role-parameters_ignore_types.yml
+    release_date: '2023-06-14'
   3.2.0:
     changes:
       bugfixes:

docs/conf.py

@@ -66,7 +66,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = None
+language = 'en'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
@@ -170,4 +170,4 @@
 # -- Options for intersphinx extension ---------------------------------------
 
 # Example configuration for intersphinx: refer to the Python standard library.
-intersphinx_mapping = {'python': ('https://docs.python.org/2', None), 'ansible': ('https://docs.ansible.com/ansible/latest/', None)}
+intersphinx_mapping = {'python': ('https://docs.python.org/3', None), 'ansible': ('https://docs.ansible.com/ansible/latest/', None)}

galaxy.yml

@@ -68,6 +68,7 @@ authors:
   - "Philipp <[email protected]>"
   - "Quirin Pamp <[email protected]>"
   - "Richard Stempfl <[email protected]>"
+  - "Richard Waax <[email protected]>"
   - "Sam <[email protected]>"
   - "Samir Jha <[email protected]>"
   - "Sean O'Keeffe <[email protected]>"
@@ -90,7 +91,7 @@ authors:
   - "metalcated <[email protected]>"
   - "russianguppie <[email protected]>"
   - "willtome <[email protected]>"
-version: "3.10.0"
+version: "3.11.0"
 license:
   - "GPL-3.0-or-later"
 tags:

plugins/doc_fragments/foreman.py

@@ -256,7 +256,7 @@ class ModuleDocFragment(object):
     type: str
   content_source:
     description:
-      - Content source.
+      - Content Source (Smart Proxy with Content) name.
       - Only available for Katello installations.
     required: false
     type: str
@@ -386,3 +386,32 @@ class ModuleDocFragment(object):
   organization:
     required: true
 '''
+
+    KATELLOEXPORT = '''
+options:
+  chunk_size_gb:
+    description:
+      - Split the exported content into archives no greater than the specified size in gigabytes.
+    required: false
+    type: int
+  format:
+    description:
+      - Export format.
+      - Choose C(syncable) if the exported content needs to be in a yum format.
+    required: false
+    type: str
+    choices:
+      - syncable
+      - importable
+    version_added: 3.10.0
+  incremental:
+    description:
+      - Export only the content that has changed since the last export.
+    required: false
+    type: bool
+  from_history_id:
+    description:
+      - Export history identifier used for incremental export. If not provided the most recent export history will be used.
+    required: false
+    type: int
+'''