From aa8c7dee29fe365d00b71403a4a8add53e4c3bb2 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 5 Jan 2023 14:10:29 -0800 Subject: [PATCH] Remove kubernetes docker jobs The kubernetes + docker jobs are failing because the ensure-kubernetes role no longer works with the docker runtime. It will be updated to use microk8s in a later change, and we will deprecate its use with docker. Change-Id: Ia0a6d470ddfe594810ad761ed3494884f56cdb46 --- .../buildset-registry-k8s-docker-post.yaml | 8 -- .../buildset-registry-k8s-docker.yaml | 27 ------- zuul-tests.d/container-roles-jobs.yaml | 80 ------------------- 3 files changed, 115 deletions(-) delete mode 100644 test-playbooks/registry/buildset-registry-k8s-docker-post.yaml delete mode 100644 test-playbooks/registry/buildset-registry-k8s-docker.yaml diff --git a/test-playbooks/registry/buildset-registry-k8s-docker-post.yaml b/test-playbooks/registry/buildset-registry-k8s-docker-post.yaml deleted file mode 100644 index 371fab2a7..000000000 --- a/test-playbooks/registry/buildset-registry-k8s-docker-post.yaml +++ /dev/null @@ -1,8 +0,0 @@ -- hosts: all - tasks: - - name: Describe dockertest pod - command: kubectl describe pod/dockertest - ignore_errors: true - - name: Describe upstream-dockertest pod - command: kubectl describe pod/upstream-dockertest - ignore_errors: true diff --git a/test-playbooks/registry/buildset-registry-k8s-docker.yaml b/test-playbooks/registry/buildset-registry-k8s-docker.yaml deleted file mode 100644 index 4793161f9..000000000 --- a/test-playbooks/registry/buildset-registry-k8s-docker.yaml +++ /dev/null @@ -1,27 +0,0 @@ -- hosts: all - roles: - - role: clear-firewall - - role: ensure-kubernetes - docker_use_buildset_registry: true - tasks: - - name: Wait for cluster to come up - command: kubectl cluster-info - register: result - until: result.rc == 0 - retries: 5 - delay: 30 - - name: Run a local test pod - command: kubectl run --image=zuul/docker-testimage dockertest - - name: Wait for the pod to be ready - command: kubectl wait --for=condition=Ready pod/dockertest --timeout=60s - - name: Check the output of the pod - shell: "kubectl logs pod/dockertest | grep 'Zuul container test'" - args: - warn: false - - - name: Run a remote test pod - command: kubectl run --image=debian:testing upstream-dockertest --command -- /bin/bash -c 'echo Upstream; sleep infinity' - - name: Wait for the pod to be ready - command: kubectl wait --for=condition=Ready pod/upstream-dockertest --timeout=60s - - name: Check the output of the pod - shell: "kubectl logs pod/upstream-dockertest | grep 'Upstream'" diff --git a/zuul-tests.d/container-roles-jobs.yaml b/zuul-tests.d/container-roles-jobs.yaml index 095bc2c7e..dc150f7c0 100644 --- a/zuul-tests.d/container-roles-jobs.yaml +++ b/zuul-tests.d/container-roles-jobs.yaml @@ -292,31 +292,6 @@ vars: container_command: docker -- job: - name: zuul-jobs-test-registry-buildset-registry-k8s-docker - dependencies: zuul-jobs-test-registry-buildset-registry - description: | - Test a buildset registry with kubernetes and docker - - It is not meant to be used directly but rather run on changes - to roles in the zuul-jobs repo. - files: - - roles/pull-from-intermediate-registry/.* - - 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/.* - - test-playbooks/registry/.* - run: test-playbooks/registry/buildset-registry-k8s-docker.yaml - post-run: - - test-playbooks/registry/buildset-registry-k8s-docker-post.yaml - - test-playbooks/registry/test-registry-post.yaml - vars: - container_command: docker - - job: name: zuul-jobs-test-registry-buildset-registry-k8s-crio dependencies: zuul-jobs-test-registry-buildset-registry @@ -370,53 +345,6 @@ - name: controller label: centos-7 -- job: - name: zuul-jobs-test-ensure-kubernetes-docker - description: | - Test the ensure-kubernetes role with docker - - This job tests changes to the ensure-kubernetes roles. It - is not meant to be used directly but rather run on changes to - roles in the zuul-jobs repo. - tags: ubuntu-platforms - 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 - -- job: - name: zuul-jobs-test-ensure-kubernetes-docker-ubuntu-bionic - description: Test the ensure-kubernetes role with docker on ubuntu-bionic - parent: zuul-jobs-test-ensure-kubernetes-docker - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-bionic - label: ubuntu-bionic - -- job: - name: zuul-jobs-test-ensure-kubernetes-docker-ubuntu-focal - description: Test the ensure-kubernetes role with docker on ubuntu-focal - parent: zuul-jobs-test-ensure-kubernetes-docker - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-focal - label: ubuntu-focal - -- job: - name: zuul-jobs-test-ensure-kubernetes-docker-ubuntu-jammy - description: Test the ensure-kubernetes role with docker on ubuntu-jammy - parent: zuul-jobs-test-ensure-kubernetes-docker - tags: auto-generated - nodeset: - nodes: - - name: ubuntu-jammy - label: ubuntu-jammy - - job: name: zuul-jobs-test-ensure-kubernetes-crio description: | @@ -599,12 +527,8 @@ - zuul-jobs-test-registry-docker-multiarch - zuul-jobs-test-registry-podman - zuul-jobs-test-registry-buildset-registry - - zuul-jobs-test-registry-buildset-registry-k8s-docker - zuul-jobs-test-registry-buildset-registry-k8s-crio - zuul-jobs-test-registry-buildset-registry-openshift-docker - - zuul-jobs-test-ensure-kubernetes-docker-ubuntu-bionic - - zuul-jobs-test-ensure-kubernetes-docker-ubuntu-focal - - zuul-jobs-test-ensure-kubernetes-docker-ubuntu-jammy - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-bionic - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-jammy @@ -634,12 +558,8 @@ - zuul-jobs-test-registry-docker-multiarch - zuul-jobs-test-registry-podman - zuul-jobs-test-registry-buildset-registry - - zuul-jobs-test-registry-buildset-registry-k8s-docker - zuul-jobs-test-registry-buildset-registry-k8s-crio - zuul-jobs-test-registry-buildset-registry-openshift-docker - - zuul-jobs-test-ensure-kubernetes-docker-ubuntu-bionic - - zuul-jobs-test-ensure-kubernetes-docker-ubuntu-focal - - zuul-jobs-test-ensure-kubernetes-docker-ubuntu-jammy - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-bionic - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-focal - zuul-jobs-test-ensure-kubernetes-crio-ubuntu-jammy