From f1cb8842a621c8a8bc1c1623d12bdd9dae115594 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Mon, 25 Nov 2019 10:31:37 +1100
Subject: [PATCH] container-roles test: remove duplicated jobs

zuul-jobs-test-install-kubernetes-docker came in with 03e42f87 but was
then duplicated with 91ae8e62.  Remove the duplicate.

In the same change (91ae8e62) it looks like
zuul-jobs-test-install-kubernetes-crio has acquired a nodeset
defintion from further up the file.  Remove it too.

I noticed this because when tools/update-test-platforms.py would run
it created the jobs twice.  I think the note proposed in
Iaaafce2ef2f60e0c66723a34b17d60ec766b5f70 will help to avoid a skew
like this happening again.

Change-Id: Id9c95727d7b458edcd85b3c09f1d191fd3fcf1b9
---
 zuul-tests.d/container-roles-jobs.yaml | 32 --------------------------
 1 file changed, 32 deletions(-)

diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml
index aa2b12f15..ac888b855 100644
--- a/zuul-tests.d/container-roles-jobs.yaml
+++ b/zuul-tests.d/container-roles-jobs.yaml
@@ -75,38 +75,6 @@
       - test-playbooks/registry/buildset-registry-k8s-docker-post.yaml
       - test-playbooks/registry/test-registry-post.yaml
 
-- job:
-    name: zuul-jobs-test-install-kubernetes-docker
-    description: |
-      Test the install-kubernetes role with docker
-
-      This job tests changes to the install-kubernetes roles.  It
-      is not meant to be used directly but rather run on changes to
-      roles in the zuul-jobs repo.
-    files:
-      - roles/install-docker/.*
-      - roles/install-kubernetes/.*
-      - test-playbooks/install-kubernetes.yaml
-    run: test-playbooks/install-kubernetes/docker.yaml
-    post-run: test-playbooks/install-kubernetes/post.yaml
-
-- job:
-    name: zuul-jobs-test-install-kubernetes-crio
-    description: |
-      Test the install-kubernetes role with crio-o
-
-      This job tests changes to the install-kubernetes roles.  It
-      is not meant to be used directly but rather run on changes to
-      roles in the zuul-jobs repo.
-    nodeset:
-      nodes:
-        - name: intermediate-registry
-          label: ubuntu-bionic
-        - name: executor
-          label: ubuntu-bionic
-        - name: builder
-          label: ubuntu-bionic
-
 - job:
     name: zuul-jobs-test-install-kubernetes-docker
     description: |