Merge pull request #5188 from mtnbikenc/test-common-entry

Test: Fail on entry point playbooks in common

playbooks/common/openshift-cluster/update_repos_and_packages.yml

@@ -1,18 +0,0 @@
----
-- include: evaluate_groups.yml
-
-- name: Subscribe hosts, update repos and update OS packages
-  hosts: oo_hosts_to_update
-  roles:
-  # Explicitly calling openshift_facts because it appears that when
-  # rhel_subscribe is skipped that the openshift_facts dependency for
-  # openshift_repos is also skipped (this is the case at least for Ansible
-  # 2.0.2)
-  - openshift_facts
-  - role: rhel_subscribe
-    when: deployment_type in ["enterprise", "atomic-enterprise", "openshift-enterprise"] and
-          ansible_distribution == "RedHat" and
-          lookup('oo_option', 'rhel_skip_subscription') | default(rhsub_skip, True) |
-            default('no', True) | lower in ['no', 'false']
-  - openshift_repos
-  - os_update_latest

playbooks/common/openshift-cluster/upgrades/docker/docker_upgrade.yml

@@ -60,7 +60,7 @@
     retries: 60
     delay: 60
 
-  - include: upgrade.yml
+  - include: tasks/upgrade.yml
     when: l_docker_upgrade is defined and l_docker_upgrade | bool
 
   - name: Set node schedulability

playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml

@@ -284,7 +284,7 @@
   roles:
   - openshift_facts
   tasks:
-  - include: docker/upgrade.yml
+  - include: docker/tasks/upgrade.yml
     when: l_docker_upgrade is defined and l_docker_upgrade | bool and not openshift.common.is_atomic | bool
 
 - name: Drain and upgrade master nodes

playbooks/common/openshift-cluster/upgrades/v3_3/upgrade.yml

@@ -89,7 +89,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_control_plane.yml

@@ -93,7 +93,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_3/upgrade_nodes.yml

@@ -90,7 +90,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_4/upgrade.yml

@@ -89,7 +89,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_4/upgrade_control_plane.yml

@@ -93,7 +93,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_4/upgrade_nodes.yml

@@ -90,7 +90,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_5/upgrade.yml

@@ -89,7 +89,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_control_plane.yml

@@ -93,7 +93,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_5/upgrade_nodes.yml

@@ -90,7 +90,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade.yml

@@ -93,7 +93,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_control_plane.yml

@@ -93,7 +93,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_6/upgrade_nodes.yml

@@ -90,7 +90,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade.yml

@@ -93,7 +93,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_nodes_to_upgrade:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_control_plane.yml

@@ -93,7 +93,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_masters_to_config:oo_etcd_to_config
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

playbooks/common/openshift-cluster/upgrades/v3_7/upgrade_nodes.yml

@@ -90,7 +90,7 @@
 - name: Verify docker upgrade targets
   hosts: oo_nodes_to_upgrade
   tasks:
-  - include: ../pre/verify_docker_upgrade_targets.yml
+  - include: ../pre/tasks/verify_docker_upgrade_targets.yml
   tags:
   - pre_upgrade
 

setup.py

@@ -225,8 +225,9 @@ class OpenShiftAnsibleSyntaxCheck(Command):
         included_playbooks = set()
 
         for yaml_file in find_files(
-                os.path.join(os.getcwd(), 'playbooks', 'byo'),
-                None, None, r'\.ya?ml$'):
+                os.path.join(os.getcwd(), 'playbooks'),
+                ['adhoc', 'tasks'],
+                None, r'\.ya?ml$'):
             with open(yaml_file, 'r') as contents:
                 for task in yaml.safe_load(contents):
                     if not isinstance(task, dict):
@@ -245,19 +246,27 @@ class OpenShiftAnsibleSyntaxCheck(Command):
         # Evaluate the difference between all playbooks and included playbooks
         entrypoint_playbooks = sorted(playbooks.difference(included_playbooks))
         print('Entry point playbook count: {}'.format(len(entrypoint_playbooks)))
-        # Syntax each entry point playbook
+
         for playbook in entrypoint_playbooks:
             print('-' * 60)
             print('Syntax checking playbook: {}'.format(playbook))
-            try:
-                subprocess.check_output(
-                    ['ansible-playbook', '-i localhost,',
-                     '--syntax-check', playbook]
-                )
-            except subprocess.CalledProcessError as cpe:
-                print('{}Execution failed: {}{}'.format(
-                    self.FAIL, cpe, self.ENDC))
+
+            if 'common' in playbook:
+                # Error on any entry points in 'common'
+                print('{}Invalid entry point playbook. All playbooks must'
+                      ' start in playbooks/byo{}'.format(self.FAIL, self.ENDC))
                 has_errors = True
+            else:
+                # Syntax check each entry point playbook
+                try:
+                    subprocess.check_output(
+                        ['ansible-playbook', '-i localhost,',
+                         '--syntax-check', playbook]
+                    )
+                except subprocess.CalledProcessError as cpe:
+                    print('{}Execution failed: {}{}'.format(
+                        self.FAIL, cpe, self.ENDC))
+                    has_errors = True
         if has_errors:
             raise SystemExit(1)
 

tox.ini

@@ -22,6 +22,5 @@ commands =
     pylint: python setup.py lint
     yamllint: python setup.py yamllint
     generate_validation: python setup.py generate_validation
-    # TODO(rhcarvalho): check syntax of other important entrypoint playbooks
     ansible_syntax: python setup.py ansible_syntax
     integration: python -c 'print("run test/integration/run-tests.sh")'