Consolidate plays/tasks/tags

Simplify use of play-level tagging on three separate plays (with one
task).  Instead, make them all the same play, and apply the tags at
the task level instead.

Signed-off-by: Chris Evich <cevich@redhat.com>

contrib/test/integration/main.yml

@@ -54,9 +54,6 @@
   vars_files:
     - "{{ playbook_dir }}/vars.yml"
   environment: '{{ environment_variables }}'
-  tags:
-    - integration
-    - e2e
   tasks:
     - name: clone build and install kubernetes
       include: "build/kubernetes.yml"
@@ -65,23 +62,15 @@
 
     - name: Build and install cri-o
       include: "build/cri-o.yml"
-
-- hosts: '{{ subjects | default("all") }}'
-  vars_files:
-    - "{{ playbook_dir }}/vars.yml"
-  environment: '{{ environment_variables }}'
       tags:
-    - integration
-  tasks:
+        - always
+
     - name: run cri-o integration tests
       include: test.yml
-
-- hosts: '{{ subjects | default("all") }}'
-  vars_files:
-    - "{{ playbook_dir }}/vars.yml"
-  environment: '{{ environment_variables }}'
       tags:
-    - e2e
-  tasks:
+        - integration
+
     - name: run k8s e2e tests
       include: e2e.yml
+      tags:
+        - e2e