DNM - Publish on automation hub using Service account credentials

roles/upload-ansible-collection-fork/tasks/main.yaml

@@ -22,11 +22,19 @@
 
     - debug: var=ansible_galaxy_collection_tarballs
 
-    - name: Publish collection to Ansible Galaxy / Automation Hub
-      environment:
-        ANSIBLE_CONFIG: "{{ _ansiblecfg_tmp.path }}"
-      shell: "{{ ansible_galaxy_executable }} -vvv collection publish {{ item.path }}"
-      with_items: "{{ ansible_galaxy_collection_tarballs.files }}"
+    # - name: Publish collection to Ansible Galaxy / Automation Hub
+    #   environment:
+    #     ANSIBLE_CONFIG: "{{ _ansiblecfg_tmp.path }}"
+    #   shell: "{{ ansible_galaxy_executable }} -vvv collection publish {{ item.path }}"
+    #   with_items: "{{ ansible_galaxy_collection_tarballs.files }}"
+
+    # This is a temporary workaround before the following PR
+    # https://github.com/ansible/ansible/pull/83145 is released (2.19)
+    - name: Publish collection using ansible devel version
+      include_tasks: publish-collection-with-ansible-devel.yml
+      vars:
+        ansible_config_file_path: "{{ _ansiblecfg_tmp.path }}"
+        collection_tarballs_files: "{{ ansible_galaxy_collection_tarballs.files }}"
 
   always:
     - name: Shred ansible-galaxy credentials

roles/upload-ansible-collection-fork/tasks/publish-collection-with-ansible-devel.yml

@@ -0,0 +1,28 @@
+---
+- name: Run our-ensure-python role
+  include_role:
+    name: our-ensure-python
+  vars:
+    ensure_python__version: "3.11"
+
+- name: Run ensure-virtualenv role
+  include_role:
+    name: ensure-virtualenv
+
+- name: Setup base virtualenv_options
+  set_fact:
+    _virtualenv_options: "--python python3.11"
+
+- name: Create virtualenv for ansible-test
+  shell: "virtualenv {{ _virtualenv_options }} ~/venv"
+
+- name: Install pytest-forked into virtualenv
+  environment:
+    ANSIBLE_SKIP_CONFLICT_CHECK: '1'
+  shell: '~/venv/bin/pip install git+https://github.com/ansible/ansible@devel'
+
+- name: Publish ansible collections tarballs
+  environment:
+    ANSIBLE_CONFIG: "{{ ansible_config_file_path }}"
+  shell: "source ~/venv/bin/activate && ansible-galaxy -vvv collection publish {{ item.path }}"
+  with_items: "{{ collection_tarballs_files }}"

roles/upload-ansible-collection-fork/templates/automation_hub.cfg.j2

@@ -4,4 +4,5 @@ server_list = automation_hub
 [galaxy_server.automation_hub]
 url = https://cloud.redhat.com/api/automation-hub/
 auth_url = https://sso.redhat.com/auth/realms/redhat-external/protocol/openid-connect/token
-token = {{ ansible_galaxy_info.token }}
+client_id = {{ ansible_galaxy_info.client_id }}
+client_secret = {{ ansible_galaxy_info.client_secret }}

zuul.d/jobs.yaml

@@ -187,20 +187,6 @@
     vars:
       release_poetry_project: true
 
-- job:
-    name: refresh-automation-hub-token
-    description: |
-      Nightly job to refresh our offline token for automation hub
-
-      See https://access.redhat.com/articles/3626371 for expire information.
-    final: true
-    run: playbooks/refresh-automation-hub-token/run.yaml
-    secrets:
-      - secret: ansible_automation_hub_secret
-        name: ansible_galaxy_info
-    nodeset:
-      nodes: []
-
 - job:
     name: release-ansible-collection-automation-hub
     description: |

zuul.d/projects.yaml

@@ -177,11 +177,9 @@
     default-branch: master
     check:
       jobs:
-        - refresh-automation-hub-token
         - validate-ansible-galaxy-token
     periodic:
       jobs:
-        - refresh-automation-hub-token
         - validate-ansible-galaxy-token
 
 - project:

zuul.d/secrets.yaml

@@ -3467,27 +3467,28 @@
 - secret:
     name: ansible_automation_hub_secret
     data:
-      token: !encrypted/pkcs1-oaep
-        - lo8YBT8XyMypexb+MZRK/LLouvzNenNET0jORfZSVx+1qX+ssgdUxbvVtZQpxMR+Ue6gG
-          DAmF1B3PyWYIpcvjy7rKBnShqQELm3/LQo92dzbzZowdjNVvkLBmFKiRueGQMowH1Xntc
-          8X2VDbmqkLYaBJ4QT/C0zk/WIoNyt9/Of6zlbItz5NdZisjKVrdbZAQ0/iY2A77nbDoEA
-          lrPYXZdr/IWzuud34h/KHJiRYbNwCGfwAhlKWIXsy2EAD/E8I3Y1FCT4Lx7+zuDX5XSVq
-          3MNSJ4PZgCpDwpPwyOtpdESp1XpXp75DMTkBsDhDfGiCA3qbuYaExEidKNWPVGmgiNhZc
-          l2I0ivq9YmaTPH4kOCfGf+dMXxIltCCImnUVIcF9Gj6c8vzKGDZTA3khTC4zAsqaw73QD
-          Y/XKlgwrodj0r6y6urzriQatylpZGmZTtn8KzMJrhbDYjdBCCFym1AMjhlW4q/E2TcHOm
-          q795s8DzNgwWk2XIkK999odn+sIko4WVN1HYzpqL3TC56uXLH5zGQP79iJvRkc+RfXUPe
-          H4hUH/Hgyuj0SqxbO3QbvKhKqtYcEZ0R498+IFPiNhxRgmDxf2UGKAA69xwban40iXlnR
-          qOLXYS9yi+ygORZt0qGc7VKH5EtqCyLQQ8/+CEvd9otL966LPpvPpa2JLyLuCM=
-        - uopqzMOXMNPMsKnUwGUpoTTrPOPwRxTUBT3uCIPutk0qhbhkZd4M/VvATJk9+Afjk9cnl
-          OQTdurH31snSMC0vygvgq/fcErKdwDOMzEkHUyeejlKgi69bNDydyBZQJKQ7meghicXsf
-          CcTfq1yixB8iPqaPwW0qVvsaM4l+TvQPo6GjNhYZP7nIG2rIocQkrzaMigh4zw+Wsc7D5
-          JoE+trCBuXSAXCHJ1Ggy2+6Om3LsKH/i1QvIpru5UfaCd82Z9TlymgWdNHBMrUxT7VsSk
-          rJyGrCorp8NHqW5X5oNv3SVFw6r8nJe8expZlYe8qzQSfwkmlgzeqL9EnykIB3aQj4Jw8
-          mJ3JQdkVKtlRT9V1yp6P6OIEU9YYvs7UW+EutJfqjXsmhmIenA4FI/htlGYCv7785I53a
-          n0E245pWqdxTRnCnXORXW8j4HbTEYu7XU4ait/y6ZgOM6gS6oCO8nbIBP3jgr01d3Z9bz
-          ASKwqrtA3MUPfyMAjr3SN6B8NSQqklq5sMThNoB4EzWxipnSxcTojBNJKUZWlcjIavWCM
-          joACwuXzy44XZNTqo7zwqSbSnE8JXTGtDbh4sB0m7v6usNOZQmN6T1IGsEHq1Pqb7yWbX
-          rcD26Dw9EmOQ3EEQ3IAqMhIrngLJS1Gy0Zv0EVqjHAlCGFzGIawOs+1v+aUOug=
+      client_id: !encrypted/pkcs1-oaep
+        - OQK0ai8rTBYYg/G0A+ehwRPLi/9wOJ6OnZ44CmgdRIcmEuu/q5OQfXzZ/erRvWWO8zmNe
+          CnTuINbdp37Ydi5ScjWQZDNYncNMtz7jjGPjlOxLLAQPjEuJMkHhTgqD3fGRxFNTKBRhN
+          d0IV5oVKxvMNTCMpoTUzbh4ZhqSg5BwgmiLkBIL3Vcv66YpQLh8EQLESvIw+M6SN5AVu0
+          A3bRkHmIplkOgvV5EcIeLo6mSBtgU7cOwkglX8QTPU3voShQd1mWHa3Ca3hvL7YGzUd7w
+          PLTHfgXyLFui3j66humHdX055ohN51ynbCgmxpzRtoi9qEm2r+yTfKY2DpuWmqrET935g
+          0LG72hJxulJ/uU/4rGyJT/Ew4yLeatFfyAzQORQxFUBvRVfFMktQVDTW64A+KJDDPqHlY
+          24gy8wDUxXXW0oAYxn07Uitp3WX0liVaqGvKj7/n7lVq03h9y2VULKr8ZHnq1TsUeP90g
+          IOfotvZgMAaaluxHtHPGEI2yMGCwvOtpR5EUgpX/ZPGDgwnDlAwRTzLo2UPHZqvzUXgxM
+          fVkAEecAfp970uWK74L+7pwaxAQ2jLabSA+d0/rXAPADnPXmav/E+9Wj1REwtzbkx8nqj
+          SMb0ZritaJceA6Vi84lLXDjQqNy8irm/eP7u8F7w3X0jxSFxUJroCQcLyo+M+8=
+      client_secret: !encrypted/pkcs1-oaep
+        - a4Y1rPxdcyS8Kl+pyD/OvjFhPJdYszADkDJ7oYO3VycJbXsM5H3lgmM+gbzw/AMPKBQOU
+          5/mrjXiLGGLyT20IRgYbk2pcI1RYHZlB48glfFrheGAkdYKtuWlA9S405rPAsXBszB6Sl
+          mY7rXW17xRpwNd/nSmvA1c9wm4H+48hklZJWuTDto/1V2ed63cpqK50OWcF4jOVN8B2JP
+          xK5jCaKwKKot0LhBD1fInMrd5pvHZQbgScjbQUJCkVkRMcwKQxekpzuAegAWujBW7uvow
+          5KXpGX89eaGMSDhXxkQ1KkGn/J1xlmQi7pJt6+vPvCP5jKJxWRDNyh4141aSkRJYx4NmH
+          inR+OYhI+WrJxSlj1+WF7CFxqtWGrkcYkSTyVPVQ3GEXvyu/v+dfGd5y2Qbh9Fg7Q6C4G
+          CsSDb4au2kVAZNdT0VwYY5LLkzHUnwjMLMs5MJe7QUngWivY03KE3vHKbX+fmXmTbemte
+          60CBlCTjwYhanRiSDpsLI2qAvOKaQN0xzwNOMgH3gXmbw9NBn7OP7EO5nSh7mSjLao5i3
+          w+tYDrhIDrn+1ny53KIvUacozg7HPzWbJZ07xxy5ZX0wquGxCp1TduYZk5Pa/f005iM7H
+          k54t5LgTn5ZIgXBck10Et7B9plYpis7BoCxw+/FuaGZnKtT7ace6UM34zFvnwU=
 
 
 ####github_proposal_bot####