To add py39 jobs and remove py27 jobs from Cisco ASA (#1463)

To add py39 jobs and remove py27 jobs from Cisco ASA Depends-On: #1522 To add py39 jobs and remove py27 jobs from Cisco ASA Reviewed-by: GomathiselviS <None> Reviewed-by: Sumit Jaiswal <[email protected]>
ansible · May 4, 2022 · f62b45e · f62b45e
1 parent 13e818b
commit f62b45e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 43 deletions.
diff --git a/playbooks/ansible-network-asa-appliance/pre.yaml b/playbooks/ansible-network-asa-appliance/pre.yaml
@@ -1,5 +1,6 @@
 ---
 - hosts: controller
+  gather_facts: true
   tasks:
     - name: Ensure tox
       include_role:

diff --git a/zuul.d/cisco-asa-jobs.yaml b/zuul.d/cisco-asa-jobs.yaml
@@ -38,8 +38,8 @@
       ansible_test_integration_targets: "asa_.*"
 
 - job:
-    name: ansible-test-units-asa-python27
-    parent: ansible-test-units-base-python27
+    name: ansible-test-units-asa-python39
+    parent: ansible-test-units-base-python39
     required-projects:
       - name: github.com/ansible-collections/cisco.asa
     vars:
@@ -62,46 +62,18 @@
       ansible_collections_repo: github.com/ansible-collections/cisco.asa
 
 - job:
-    name: ansible-test-network-integration-asa-python27
+    name: ansible-test-network-integration-asa-python39
     parent: ansible-test-network-integration-asa
     nodeset: asav9-12-3
     vars:
-      ansible_test_python: 2.7
+      ansible_test_python: 3.9
 
 - job:
-    name: ansible-test-network-integration-asa-python27-stable211
-    parent: ansible-test-network-integration-asa
-    nodeset: asav9-12-3
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.11
-    vars:
-      ansible_test_python: 2.7
-
-- job:
-    name: ansible-test-network-integration-asa-python27-stable29
-    parent: ansible-test-network-integration-asa
-    nodeset: asav9-12-3
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.9
-    vars:
-      ansible_test_python: 2.7
-
-- job:
-    name: ansible-test-network-integration-asa-python38
-    parent: ansible-test-network-integration-asa
-    nodeset: asav9-12-3
-    vars:
-      ansible_test_python: 3.8
-
-- job:
-    name: ansible-test-network-integration-asa-libssh-python38
-    parent: ansible-test-network-integration-asa-python38
+    name: ansible-test-network-integration-asa-libssh-python39
+    parent: ansible-test-network-integration-asa-python39
     vars:
       ansible_test_network_cli_ssh_type: libssh
 
-
 - job:
     name: ansible-test-network-integration-asa-python38-stable212
     parent: ansible-test-network-integration-asa
@@ -142,10 +114,12 @@
       - name: github.com/ansible/ansible
         override-checkout: stable-2.9
     vars:
+      test_ansible_python_interpreter: /usr/bin/python3.8
       ansible_test_python: 3.8
 
 - job:
     name: ansible-test-network-integration-asa-libssh-python38-stable29
     parent: ansible-test-network-integration-asa-python38-stable29
     vars:
       ansible_test_network_cli_ssh_type: libssh
+      test_ansible_python_interpreter: /usr/bin/python3.8
diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml
@@ -321,7 +321,7 @@
         - ansible-test-sanity-docker-stable-2.10
         - ansible-test-sanity-docker-stable-2.11
         - ansible-test-sanity-docker-stable-2.12
-        - ansible-test-units-asa-python27
+        - ansible-test-units-asa-python39
         - ansible-test-units-asa-python36
         - ansible-test-units-asa-python37
     gate:
@@ -332,16 +332,19 @@
     name: ansible-collections-cisco-asa
     check:
       jobs: &ansible-collections-cisco-asa-jobs
-        - ansible-test-network-integration-asa-python27-stable211
-        - ansible-test-network-integration-asa-python27-stable29
-        - ansible-test-network-integration-asa-python38
-        - ansible-test-network-integration-asa-python38-stable212
-        - ansible-test-network-integration-asa-python38-stable211
-        - ansible-test-network-integration-asa-python38-stable29
-        - ansible-test-network-integration-asa-libssh-python38
+        - ansible-test-network-integration-asa-python39:
+            voting: false
+        - ansible-test-network-integration-asa-python38-stable212:
+            voting: false
+        - ansible-test-network-integration-asa-python38-stable211:
+            voting: false
+        - ansible-test-network-integration-asa-python38-stable29:
+            voting: false
+        - ansible-test-network-integration-asa-libssh-python39
         - ansible-test-network-integration-asa-libssh-python38-stable212
         - ansible-test-network-integration-asa-libssh-python38-stable211
-        - ansible-test-network-integration-asa-libssh-python38-stable29
+        - ansible-test-network-integration-asa-libssh-python38-stable29:
+            voting: false
         - build-ansible-collection:
             required-projects:
               - name: github.com/ansible-collections/ansible.netcommon