[stable-11] Replace default favicon URL again (#11909) (#11914) (#11916)

Replace default favicon URL again (#11909)

* replace default favicon URL

* add changelog fragment for PR 11909

* fix syntax for change fragment

* use higher res favicon by default

---------

(cherry picked from commit d57a667274)




(cherry picked from commit ac0c24637a)

Co-authored-by: Lars Krahl <57526005+mmslkr@users.noreply.github.com>
Co-authored-by: Lars Krahl <lars.krahl@telekom.de>
Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>

.azure-pipelines/azure-pipelines.yml

@@ -202,8 +202,8 @@ stages:
         parameters:
           testFormat: 2.18/{0}
           targets:
-            - name: macOS 14.3
-              test: macos/14.3
+            # - name: macOS 14.3
+            #   test: macos/14.3
             - name: FreeBSD 14.1
               test: freebsd/14.1
           groups:

.github/BOTMETA.yml

@@ -1596,7 +1596,7 @@ macros:
   plugin_utils: plugins/plugin_utils
   tests: plugins/test
   team_ansible_core:
-  team_aix: MorrisA bcoca d-little flynn1973 gforster kairoaraujo marvin-sinister mator molekuul ramooncamacho wtcross
+  team_aix: MorrisA bcoca d-little flynn1973 gforster kairoaraujo marvin-sinister molekuul ramooncamacho wtcross
   team_bsd: JoergFiedler MacLemon bcoca dch jasperla mekanix opoplawski overhacked tuxillo
   team_consul: sgargan apollo13 Ilgmi
   team_cyberark_conjur: jvanderhoof ryanprior
@@ -1618,7 +1618,7 @@ macros:
   team_redfish: mraineri tomasg2012 xmadsen renxulei rajeevkallur bhavya06 jyundt
   team_rhsm: cnsnyder ptoscano
   team_scaleway: remyleone abarbare
-  team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
+  team_solaris: bcoca fishman jasperla jpdasma scathatheworm troy2914 xen0l
   team_suse: commel evrardjp lrupp AnderEnder alxgu andytom sealor
   team_virt: joshainglis karmab Thulium-Drake Ajpantuso
   team_wdc: mikemoerk

changelogs/fragments/11909-fix-favicon-url.yml

@@ -0,0 +1,2 @@
+minor_changes:
+  - "mattermost, rocketchat, slack - update default ``icon_url`` to ansible favicon (https://github.com/ansible-collections/community.general/pull/11909)."

galaxy.yml

@@ -5,7 +5,7 @@
 
 namespace: community
 name: general
-version: 10.7.8
+version: 10.7.9
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

plugins/modules/mattermost.py

@@ -66,7 +66,7 @@ options:
     type: str
     description:
       - URL for the message sender's icon.
-    default: https://docs.ansible.com/favicon.ico
+    default: https://docs.ansible.com/favicon/favicon.ico
   priority:
     type: str
     description:
@@ -139,7 +139,7 @@ def main():
             text=dict(type='str'),
             channel=dict(type='str', default=None),
             username=dict(type='str', default='Ansible'),
-            icon_url=dict(type='str', default='https://docs.ansible.com/favicon.ico'),
+            icon_url=dict(type='str', default='https://docs.ansible.com/favicon/favicon.ico'),
             priority=dict(type='str', default=None, choices=['important', 'urgent']),
             validate_certs=dict(default=True, type='bool'),
             attachments=dict(type='list', elements='dict'),

plugins/modules/packet_volume_attachment.py

@@ -86,7 +86,7 @@ EXAMPLES = r"""
 
   tasks:
     - name: Create volume
-      packet_volume:
+      community.general.packet_volume:
         description: "{{ volname }}"
         project_id: "{{ project_id }}"
         facility: ewr1
@@ -98,7 +98,7 @@ EXAMPLES = r"""
           snapshot_frequency: 1day
 
     - name: Create a device
-      packet_device:
+      community.general.packet_device:
         project_id: "{{ project_id }}"
         hostnames: "{{ devname }}"
         operating_system: ubuntu_16_04

plugins/modules/rocketchat.py

@@ -63,7 +63,7 @@ options:
     type: str
     description:
       - URL for the message sender's icon.
-    default: "https://docs.ansible.com/favicon.ico"
+    default: "https://docs.ansible.com/favicon/favicon.ico"
   icon_emoji:
     type: str
     description:
@@ -227,7 +227,7 @@ def main():
             msg=dict(type='str', required=False),
             channel=dict(type='str'),
             username=dict(type='str', default='Ansible'),
-            icon_url=dict(type='str', default='https://docs.ansible.com/favicon.ico'),
+            icon_url=dict(type='str', default='https://docs.ansible.com/favicon/favicon.ico'),
             icon_emoji=dict(type='str'),
             link_names=dict(type='int', default=1, choices=[0, 1]),
             validate_certs=dict(default=True, type='bool'),

plugins/modules/slack.py

@@ -83,7 +83,7 @@ options:
     type: str
     description:
       - URL for the message sender's icon.
-    default: https://docs.ansible.com/favicon.ico
+    default: https://docs.ansible.com/favicon/favicon.ico
   icon_emoji:
     type: str
     description:
@@ -445,7 +445,7 @@ def main():
             channel=dict(type='str'),
             thread_id=dict(type='str'),
             username=dict(type='str', default='Ansible'),
-            icon_url=dict(type='str', default='https://docs.ansible.com/favicon.ico'),
+            icon_url=dict(type='str', default='https://docs.ansible.com/favicon/favicon.ico'),
             icon_emoji=dict(type='str'),
             link_names=dict(type='int', default=1, choices=[0, 1]),
             parse=dict(type='str', choices=['none', 'full']),

tests/integration/targets/android_sdk/tasks/setup.yml

@@ -52,9 +52,11 @@
     - name: Symlink java
       become: true
       file:
-        src: "/usr/local/opt/openjdk@17/libexec/openjdk.jdk"
+        src: "{{ brew_prefix }}/opt/openjdk@17/libexec/openjdk.jdk"
         dest: "/Library/Java/JavaVirtualMachines/openjdk-17.jdk"
         state: link
+      vars:
+        brew_prefix: "{{ lookup('pipe', 'brew --prefix') }}"
   when:
     - ansible_os_family == 'Darwin'
 

tests/integration/targets/iptables_state/tasks/main.yml

@@ -8,12 +8,21 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: ensure iptables package is installed
+- name: ensure iptables package is installed (non-RHEL)
   package:
     name:
       - iptables
   become: true
+  when: not (ansible_facts.distribution == 'RedHat' and ansible_facts.distribution_major_version|int >= 10)
 
+- name: ensure iptables package is installed (RHEL 10+)
+  package:
+    name:
+      - "kernel-modules-extra-matched-{{ ansible_facts.kernel }}"
+      - "iptables-nft"
+      - "kernel-modules-extra-{{ ansible_facts.kernel }}"
+  become: true
+  when: ansible_facts.distribution == 'RedHat' and ansible_facts.distribution_major_version|int >= 10
 
 - name: include tasks
   vars:

tests/integration/targets/iptables_state/tasks/tests/01-tables.yml

@@ -272,7 +272,7 @@
   assert:
     that:
       - iptables_state is failed
-      - "iptables_state.msg == 'Table mangle to restore not defined in {{ iptables_tests }}'"
+      - "iptables_state.msg == ('Table mangle to restore not defined in ' ~ iptables_tests)"
     success_msg: >-
       The previous error has been triggered by trying to restore a table
       that is missing in the file provided to iptables-restore.

tests/integration/targets/launchd/tasks/setup.yml

@@ -9,6 +9,11 @@
     dest: "{{ launchd_plist_location }}"
   become: true
 
+- name: ensure target directory exists
+  file:
+    path: /usr/local/sbin
+    state: directory
+
 - name: install the test daemon script
   copy:
     src: ansible_test_service.py

tests/integration/targets/npm/tasks/main.yml

@@ -25,8 +25,9 @@
     - include_tasks: run.yml
       vars:
         nodejs_version: '{{ item }}'
-        nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_system|lower }}-x{{ ansible_userspace_bits }}'
+        nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_facts.system|lower }}-{{ nodejs_arch }}'
+        nodejs_arch: '{{ "x64" if ansible_architecture == "x86_64" else "arm64" if ansible_architecture in ("arm64", "aarch64") else ansible_architecture }}'
+        nodejs_ext: '{{ ".tar.xz" if ansible_system == "Linux" else ".tar.gz" }}'
+        nodejs_download: 'https://nodejs.org/dist/v{{ nodejs_version }}/{{ nodejs_path }}{{ nodejs_ext }}'
       with_items:
-        - 7.10.1 # provides npm 4.2.0 (last npm < 5 released)
-        - 8.0.0 # provides npm 5.0.0
-        - 8.2.0 # provides npm 5.3.0 (output change with this version)
+        - 16.20.2  # oldest node version with macOS arm64 support

tests/integration/targets/npm/tasks/setup.yml

@@ -3,9 +3,13 @@
 # GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-- name: 'Download NPM'
+- name: Show Node.js Download URL
+  debug:
+    var: nodejs_download
+
+- name: Download Node.js
   unarchive:
-    src: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/npm/{{ nodejs_path }}.tar.gz'
+    src: '{{ nodejs_download }}'
     dest: '{{ remote_tmp_dir }}'
     remote_src: true
     creates: '{{ remote_tmp_dir }}/{{ nodejs_path }}.tar.gz'

tests/integration/targets/yarn/tasks/main.yml

@@ -14,10 +14,12 @@
 - include_tasks: run.yml
   vars:
     nodejs_version: '{{ item.node_version }}'
-    nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_system|lower }}-x{{ ansible_userspace_bits }}'
+    nodejs_path: 'node-v{{ nodejs_version }}-{{ ansible_facts.system|lower }}-{{ nodejs_arch }}'
+    nodejs_arch: '{{ "x64" if ansible_architecture == "x86_64" else "arm64" if ansible_architecture in ("arm64", "aarch64") else ansible_architecture }}'
+    nodejs_ext: '{{ ".tar.xz" if ansible_system == "Linux" else ".tar.gz" }}'
+    nodejs_download: 'https://nodejs.org/dist/v{{ nodejs_version }}/{{ nodejs_path }}{{ nodejs_ext }}'
     yarn_version: '{{ item.yarn_version }}'
   with_items:
-    - {node_version: 4.8.0, yarn_version: 1.6.0}  # Lowest compatible nodejs version
-    - {node_version: 8.0.0, yarn_version: 1.6.0}
+    - {node_version: 16.20.2, yarn_version: 1.22.22}  # oldest node version with macOS arm64 support
   when:
     - not (ansible_os_family == 'Alpine')  # TODO

tests/integration/targets/yarn/tasks/run.yml

@@ -8,16 +8,20 @@
     path: /usr/local/lib/nodejs
     state: directory
 
-- name: 'Download Nodejs'
+- name: Show Node.js Download URL
+  debug:
+    var: nodejs_download
+
+- name: Download Node.js
   unarchive:
-    src: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/yarn/{{ nodejs_path }}.tar.gz'
+    src: '{{ nodejs_download }}'
     dest: '{{ remote_tmp_dir }}'
     remote_src: true
     creates: '{{ remote_tmp_dir }}/{{ nodejs_path }}.tar.gz'
 
 - name: 'Download Yarn'
   unarchive:
-    src: 'https://ansible-ci-files.s3.amazonaws.com/test/integration/targets/yarn/yarn-v{{yarn_version}}.tar.gz'
+    src: 'https://github.com/yarnpkg/yarn/releases/download/v{{yarn_version}}/yarn-v{{yarn_version}}.tar.gz'
     dest: '{{ remote_tmp_dir }}'
     remote_src: true
     creates: '{{ remote_tmp_dir }}/yarn-v{{yarn_version}}_pkg.tar.gz'