Apply review

Signed-off-by: Alina Buzachis <[email protected]>
ansible · May 5, 2022 · e1f7e21 · e1f7e21
1 parent 471c222
commit e1f7e21
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 25 deletions.
diff --git a/playbooks/ansible-cloud/py39/pre.yaml b/playbooks/ansible-cloud/py39/pre.yaml
@@ -1,17 +1,11 @@
 ---
 - hosts: all
   tasks:
-    - name: Ensure python3.9 is present (Debian/Ubuntu)
-      become: true
-      package:
-        name: python39-devel
-        state: present
-      when: ansible_os_family != "RedHat"
     - name: Ensure python3.9 is present (Red Hat)
       become: true
       package:
         name:
           - python3.9
           - gcc
         state: present
-      when: ansible_os_family == "RedHat"
+      when: ansible_os_family == "RedHat"
diff --git a/zuul.ansible.d/nodesets.yaml b/zuul.ansible.d/nodesets.yaml
@@ -625,16 +625,6 @@
         nodes:
           - fedora-35
 
-- nodeset:
-    name: controller-python39
-    nodes:
-      - name: fedora-35
-        label: ansible-fedora-35-1vcpu
-    groups:
-      - name: controller
-        nodes:
-          - fedora-35
-
 - nodeset:
     name: controller-python36-f34
     nodes:

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
@@ -204,6 +204,15 @@
     vars:
       ansible_collections_repo: github.com/ansible-collections/ansible.posix
 
+- job:
+    name: ansible-test-units-posix-python39
+    parent: ansible-test-units-base-python39
+    required-projects:
+      - name: github.com/ansible-collections/ansible.posix
+    timeout: 3600
+    vars:
+      ansible_collections_repo: github.com/ansible-collections/ansible.posix
+
 - job:
     name: ansible-test-units-base
     parent: unittests
@@ -273,7 +282,7 @@
 - job:
     name: ansible-test-units-base-python39
     parent: ansible-test-units-base
-    nodeset: controller-python39
+    nodeset: fedora-35-1vcpu
     abstract: true
     vars:
       ansible_test_python: 3.9

diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
@@ -1401,6 +1401,7 @@
         - ansible-test-sanity-docker-stable-2.11
         - ansible-test-sanity-docker-stable-2.12
         - ansible-test-units-posix
+        - ansible-test-units-posix-python39
     gate:
       jobs: *ansible-collections-ansible-posix-units-jobs
 

diff --git a/zuul.sf.d/ansible-cloud-jobs.yaml b/zuul.sf.d/ansible-cloud-jobs.yaml
@@ -280,7 +280,7 @@
 - job:
     name: ansible-test-cloud-integration-aws
     parent: ansible-core-ci-aws-session
-    nodeset: controller-python39
+    nodeset: fedora-35-1vcpu
     dependencies:
       - name: build-ansible-collection
       - name: ansible-test-splitter

diff --git a/zuul.sf.d/nodesets.yaml b/zuul.sf.d/nodesets.yaml
@@ -337,12 +337,6 @@
       - name: controller
         label: ansible-fedora-35-1vcpu
 
-- nodeset:
-    name: controller-python39
-    nodes:
-      - name: controller
-        label: ansible-fedora-35-1vcpu
-
 - nodeset:
     name: ansible-tox-linters
     nodes: