From 7d6d8621342e8485f882d7c9900fe8a5b8b00527 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Thu, 20 Feb 2025 09:56:02 -0500 Subject: [PATCH] 22594: Remove jenkins-image-k8s-tests We never set up a Jenkins job to actually use this image, as evidenced by the fact it never got updated past Debian 10. So much has changed about Kubernetes in the meantime that I expect if we revisit support or testing, we'll want to look at it with fresh eyes. Arvados-DCO-1.1-Signed-off-by: Brett Smith --- jenkins/packer-images/1078ECD7.asc | 30 ------------ .../jenkins-image-k8s-tests.json | 39 --------------- .../packer-images/jenkins-image-k8s-tests.sh | 49 ------------------- 3 files changed, 118 deletions(-) delete mode 100644 jenkins/packer-images/1078ECD7.asc delete mode 100644 jenkins/packer-images/jenkins-image-k8s-tests.json delete mode 100755 jenkins/packer-images/jenkins-image-k8s-tests.sh diff --git a/jenkins/packer-images/1078ECD7.asc b/jenkins/packer-images/1078ECD7.asc deleted file mode 100644 index edc62f4..0000000 --- a/jenkins/packer-images/1078ECD7.asc +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBEzhgeoBCAChhoK1dqpWzNyDWqRGEvdFdkJaA9D2HRwKPfBfjAoePX6ZyrpA -ItlUsvt/8s/DRiTiPEFQR4S7VqocmU6whJc3gDEGyOM6b1NF873lIfSVwUoE42QE -a76dO8woOYgLUyxu2mKG+bJgGMumjBJt6ZOndYVjTYB/7sEeVxwmMVulfZe0s6zg -ut0+SoTYg2R36qIqeIcWllYt97sEYnyy1qXMis4/3IZnuWkS/frsPR3aeUI4W+o2 -NDN1kj49+LMe7Fb5b7jZY08rZbAWXi1rU1hQx4jC9RvYqlT4HNld4Bn7os1IvOOA -wNiR0oiVdiuDbBxcMvRPktxMrFVjowusRLq/ABEBAAG0PUN1cm92ZXJzZSwgSW5j -IEF1dG9tYXRpYyBTaWduaW5nIEtleSA8c3lzYWRtaW5AY3Vyb3ZlcnNlLmNvbT6J -ATgEEwECACIFAlNgYIECGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEFcW -WREQeOzXPkEH/jQJDIYI1dxWcYiA+hczmpaZvN2/pc/kwIW/6a03+6zqmSNkebOE -TgoDILacSYc17hy20R1/rWyUstOMKcEgFDBlSehhHyl0f7q/w7d8Ais6MabzsPfx -IceJpsjUg87+BR7qWhgQ0sxmtIF2TKuTFLs+nkGsgSsiBOEF4NvHxuj3HD4y8F27 -HNqrkqwjLS8xJwwH5Gp2uMEVr1AXIH3iSRjJ8X124s8iEP97Q/3IazoYRf9/MCSm -QEx8KzxwDX6t4bW6O4D01K+e9gdkTY70dcMgJoqm5IsX7yxjEubiOunphtlJnZ9d -Oi1yBN5UM3pWKAdcfRj4rcfV9Simvpx9av+5AQ0ETOGB6gEIAMAA0HVMG0BbdnU7 -wWgl5eFdT0AUSrXK/WdcKqVEGGv+c68NETSHWZOJX7O46Eao4gY4cTYprVMBzxpY -/BtQSYLpE0HLvBc1fcFd61Yz4H/9rGSNY0GcIQEbOjbJY5mr8qFsQ1K/mAf3aUL3 -b6ni4sHVicRiRr0Gl4Ihorlskpfu1SHs/C5tvTSVNF9p4vtl5892y1yILQeVpcBs -NCR7MUpdS49xCpvnAWsDZX+ij6LTR3lzCm/ZLCg4gNuZkjgU9oqVfGkqysW7WZ8S -OLvzAwUw7i1EIFX8q6QdudGoezxz8m8OgZM1v8AFpYEKlhEPf1W0MSfaRDwrj866 -8nCLruEAEQEAAYkBHwQYAQIACQUCTOGB6gIbDAAKCRBXFlkREHjs199EB/4+p0G1 -3PHxt6rLWSCGXobDOu4ZOA/qnv0D/JhOLroFds5TzQv6vnS8eAkhCTjHVA+b58cm -kXpI0oYcD4ZP+KK1CHKq2rGfwou7HfAF+icnNqYkeBOkjjbCgkvBlcCInuAuU8JX -DZMkfFk52+eBKwTjS/J/fQp0vDru8bHLp98WgdRHWfJQ3mc3gz4A5sR6zhrGPW6/ -ssnROS4dC2Ohp35GpgN1KjD3EmEw5RoSBYlyrARCaMsivgIKMxGUEyFZWhuJt3N1 -2MTddRwz28hbmYCi+MzHYDbRv+cSyUDmvXaWhfkNKBepClBA1rTWBcldit5vvlqr -yPet6wIKrtLGhAqZ -=CLkG ------END PGP PUBLIC KEY BLOCK----- diff --git a/jenkins/packer-images/jenkins-image-k8s-tests.json b/jenkins/packer-images/jenkins-image-k8s-tests.json deleted file mode 100644 index f36f929..0000000 --- a/jenkins/packer-images/jenkins-image-k8s-tests.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "variables": { - "key_file": "{{env `packerbuildkey`}}" - }, - "builders": [ - { - "type": "googlecompute", - "account_file": "{{user `key_file` }}", - "project_id": "phoenix-project-42-ci", - "source_image": "debian-11-bullseye-v20231010", - "zone": "us-central1-b", - "disk_size": "10", - "image_name": "jenkins-image-k8s-tests{{isotime \"20060102150405\"}}", - "image_family": "jenkins", - "image_licenses": ["projects/vm-options/global/licenses/enable-vmx"], - "ssh_username": "jenkins" - } - ], - "provisioners": [ - { - "type": "file", - "source": "node-ready.sh", - "destination": "/tmp/node-ready.sh" - }, - { - "type": "file", - "source": "1078ECD7.asc", - "destination": "/tmp/1078ECD7.asc" - }, - { - "type": "shell", - "script": "./jenkins-image-common.sh" - }, - { - "type": "shell", - "script": "./jenkins-image-k8s-tests.sh" - } - ] -} diff --git a/jenkins/packer-images/jenkins-image-k8s-tests.sh b/jenkins/packer-images/jenkins-image-k8s-tests.sh deleted file mode 100755 index 657e371..0000000 --- a/jenkins/packer-images/jenkins-image-k8s-tests.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# Copyright (C) The Arvados Authors. All rights reserved. -# -# SPDX-License-Identifier: Apache-2.0 - -set -eo pipefail - -echo "deb http://apt.arvados.org/buster buster main" | sudo tee /etc/apt/sources.list.d/arvados.list - -# Install a few dependencies -sudo DEBIAN_FRONTEND=noninteractive apt-get -y --no-install-recommends install gnupg2 wget git default-jdk docker.io netcat - -sudo usermod -a -G docker jenkins - -cat /tmp/1078ECD7.asc | sudo apt-key add - -sudo DEBIAN_FRONTEND=noninteractive apt-get update -# Install Arvados Packages -# the python3 version is currently broken, see #16434, update to python3 when 2.0.3 is out -# python3-arvados-cwl-runner \ -sudo DEBIAN_FRONTEND=noninteractive apt-get install -y \ - python-arvados-cwl-runner \ - python3-arvados-python-client \ - -# Install kubectl + helm -# GCE provides the latest kubectl via apt, automatically -sudo DEBIAN_FRONTEND=noninteractive apt-get install -y kubectl -cd /usr/src -sudo wget https://get.helm.sh/helm-v3.2.1-linux-amd64.tar.gz -sudo tar xzf helm-v3.2.1-linux-amd64.tar.gz -sudo mv linux-amd64/helm /usr/bin/ - -# The rest of this script is what's needed for testing with minikube minikube -sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends dnsmasq - -# Install KVM -sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends qemu-kvm libvirt-clients libvirt-daemon-system - -# Add the jenkins user to the libvirt group -sudo usermod -a -G libvirt jenkins - -# Install minikube -sudo wget -O /usr/local/bin/minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64 -sudo chmod +x /usr/local/bin/minikube - -# default to the kvm2 driver *for the jenkins user* (hence, no sudo) -minikube config set driver kvm2 - -sudo DEBIAN_FRONTEND=noninteractive apt-get clean -- 2.30.2