ensure-kubernetes: refactor to use ensure-package-repositories

This patch refactors ensure-kubernetes to use the new generic role
to allow it to be cross-platform in the future.

Change-Id: Ic90c8973431823814c7e6b122f4ef25a67d64c2f

roles/ensure-kubernetes/tasks/main.yaml

@@ -1,14 +1,11 @@
-- name: Install apt key
+- name: Add all repositories
-  become: yes
+  include_role:
-  apt_key:
+    name: ensure-package-repositories
-    url: "https://packages.cloud.google.com/apt/doc/apt-key.gpg"
+  vars:
-    state: present
+    repositories_keys:
-
+      - url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
-- name: Add kubernetes repo
+    repositories_list:
-  become: yes
+      - repo: deb http://apt.kubernetes.io/ kubernetes-xenial main
-  apt_repository:
-    repo: deb http://apt.kubernetes.io/ kubernetes-xenial main
-    state: present
 
 - name: Install kubernetes packages and dependencies
   become: yes

zuul-tests.d/container-roles-jobs.yaml

@@ -140,6 +140,7 @@
       - roles/push-to-intermediate-registry/.*
       - roles/ensure-docker/.*
       - roles/ensure-kubernetes/.*
+      - roles/ensure-package-repositories/.*
       - roles/build-docker-image/.*
       - roles/run-buildset-registry/.*
       - roles/use-buildset-registry/.*
@@ -163,6 +164,7 @@
       - roles/push-to-intermediate-registry/.*
       - roles/ensure-docker/.*
       - roles/ensure-kubernetes/.*
+      - roles/ensure-package-repositories/.*
       - roles/build-docker-image/.*
       - roles/run-buildset-registry/.*
       - roles/use-buildset-registry/.*
@@ -187,6 +189,7 @@
       - roles/push-to-intermediate-registry/.*
       - roles/ensure-docker/.*
       - roles/ensure-kubernetes/.*
+      - roles/ensure-package-repositories/.*
       - roles/build-docker-image/.*
       - roles/run-buildset-registry/.*
       - roles/use-buildset-registry/.*
@@ -236,6 +239,7 @@
     files:
       - roles/ensure-docker/.*
       - roles/ensure-kubernetes/.*
+      - roles/ensure-package-repositories/.*
       - test-playbooks/ensure-kubernetes/.*
     run: test-playbooks/ensure-kubernetes/docker.yaml
     post-run: test-playbooks/ensure-kubernetes/post.yaml
@@ -251,6 +255,7 @@
     files:
       - roles/ensure-docker/.*
       - roles/ensure-kubernetes/.*
+      - roles/ensure-package-repositories/.*
       - test-playbooks/ensure-kubernetes/.*
     run: test-playbooks/ensure-kubernetes/crio.yaml
     post-run: test-playbooks/ensure-kubernetes/post.yaml