From 334f05665709d3d88140a669ee70847580fb1730 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 24 Nov 2025 15:24:19 +0100 Subject: [PATCH] ci-automation: remove Equinix Metal testing After years of good services and sponsoring from Equinix Metal, we need to retire those tests for AMD64 / ARM64 bare metal instances. As Equinix Metal offering is still around until June 2026, let's continue to produce and release Flatcar images for any users still using those images but we won't test them as the Flatcar account won't be covered by sponsoring. Signed-off-by: Mathieu Tortuyaux --- ci-automation/ci-config.env | 20 ------ ci-automation/garbage_collect.sh | 1 - ci-automation/garbage_collect_cloud.sh | 2 - ci-automation/vendor-testing/equinix_metal.sh | 65 ------------------- 4 files changed, 88 deletions(-) delete mode 100755 ci-automation/vendor-testing/equinix_metal.sh diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env index 441b021ecc..29c899d677 100644 --- a/ci-automation/ci-config.env +++ b/ci-automation/ci-config.env @@ -81,26 +81,6 @@ QEMU_DEVCONTAINER_URL="${QEMU_DEVCONTAINER_URL:-}" QEMU_DEVCONTAINER_BINHOST_URL="${QEMU_DEVCONTAINER_BINHOST_URL:-}" QEMU_DEVCONTAINER_FILE="${QEMU_DEVCONTAINER_FILE:-}" -# -- Equinix Metal -- -EQUINIXMETAL_PARALLEL="${PARALLEL_TESTS:-4}" -# Metro is a set of Equinix Metal regions -EQUINIXMETAL_amd64_METRO="${EQUINIXMETAL_amd64_METRO:-SV}" -EQUINIXMETAL_arm64_METRO="${EQUINIXMETAL_arm64_METRO:-DC}" -# Name of the Equinix Metal image -EQUINIXMETAL_IMAGE_NAME="flatcar_production_packet_image.bin.bz2" -# Storage URL required to store user-data -EQUINIXMETAL_STORAGE_URL="${EQUINIXMETAL_STORAGE_URL:-gs://flatcar-jenkins/mantle/packet}" -# Equinix Metal default AMD64 instance type -EQUINIXMETAL_amd64_INSTANCE_TYPE="${EQUINIXMETAL_amd64_INSTANCE_TYPE:-c3.small.x86}" -# Space separated list of instance types. On those instances the -# cl.internet kola test will be run if this test is selected to run. -EQUINIXMETAL_amd64_MORE_INSTANCE_TYPES="m3.small.x86 c3.medium.x86 m3.large.x86 s3.xlarge.x86 n2.xlarge.x86" -# Equinix Metal default ARM64 instance type -EQUINIXMETAL_arm64_INSTANCE_TYPE="c3.large.arm" -# Space separated list of instance types. On those instances the -# cl.internet kola test will be run if this test is selected to run. -EQUINIXMETAL_arm64_MORE_INSTANCE_TYPES="" - # -- PXE -- PXE_KERNEL_NAME="flatcar_production_pxe.vmlinuz" PXE_IMAGE_NAME="flatcar_production_pxe_image.cpio.gz" diff --git a/ci-automation/garbage_collect.sh b/ci-automation/garbage_collect.sh index 058c066381..44fcebb889 100644 --- a/ci-automation/garbage_collect.sh +++ b/ci-automation/garbage_collect.sh @@ -258,7 +258,6 @@ function _garbage_collect_impl() { --env AWS_ACCESS_KEY_ID --env AWS_SECRET_ACCESS_KEY \ --env AWS_CREDENTIALS \ --env DIGITALOCEAN_TOKEN_JSON \ - --env EQUINIXMETAL_KEY --env EQUINIXMETAL_PROJECT \ --env GCP_JSON_KEY \ --env VMWARE_ESX_CREDS \ --env BRIGHTBOX_CLIENT_ID --env BRIGHTBOX_CLIENT_SECRET \ diff --git a/ci-automation/garbage_collect_cloud.sh b/ci-automation/garbage_collect_cloud.sh index 12a2f0db5a..78eb8d0735 100755 --- a/ci-automation/garbage_collect_cloud.sh +++ b/ci-automation/garbage_collect_cloud.sh @@ -5,8 +5,6 @@ timeout --signal=SIGQUIT 60m ore aws gc --access-id "${AWS_ACCESS_KEY_ID}" --sec timeout --signal=SIGQUIT 60m ore do gc --config-file=<(echo "${DIGITALOCEAN_TOKEN_JSON}" | base64 --decode) timeout --signal=SIGQUIT 60m ore gcloud gc --json-key <(echo "${GCP_JSON_KEY}" | base64 --decode) timeout --signal=SIGQUIT 60m ore azure gc --duration 6h -timeout --signal=SIGQUIT 60m ore equinixmetal gc --duration 6h \ - --project="${EQUINIXMETAL_PROJECT}" --gs-json-key=<(echo "${GCP_JSON_KEY}" | base64 --decode) --api-key="${EQUINIXMETAL_KEY}" timeout --signal=SIGQUIT 60m ore brightbox gc --duration 6h \ --brightbox-client-id="${BRIGHTBOX_CLIENT_ID}" --brightbox-client-secret="${BRIGHTBOX_CLIENT_SECRET}" timeout --signal=SIGQUIT 60m ore akamai gc --duration 6h \ diff --git a/ci-automation/vendor-testing/equinix_metal.sh b/ci-automation/vendor-testing/equinix_metal.sh deleted file mode 100755 index 376742e133..0000000000 --- a/ci-automation/vendor-testing/equinix_metal.sh +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/bash -# Copyright (c) 2021 The Flatcar Maintainers. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -set -euo pipefail - -# Test execution script for the Equinix Metal vendor image. -# This script is supposed to run in the mantle container. -# This script requires the PXE images to be built. - -source ci-automation/vendor_test.sh - -# Equinix Metal ARM server are not yet hourly available in the default `SV` metro -equinixmetal_metro_var="EQUINIXMETAL_${CIA_ARCH}_METRO" -equinixmetal_metro="${!equinixmetal_metro_var}" - -EQUINIXMETAL_INSTANCE_TYPE_VAR="EQUINIXMETAL_${CIA_ARCH}_INSTANCE_TYPE" -EQUINIXMETAL_INSTANCE_TYPE="${!EQUINIXMETAL_INSTANCE_TYPE_VAR}" -MORE_INSTANCE_TYPES_VAR="EQUINIXMETAL_${CIA_ARCH}_MORE_INSTANCE_TYPES" -MORE_INSTANCE_TYPES=( ${!MORE_INSTANCE_TYPES_VAR} ) - -# The maximum is 6h coming from the ore GC duration parameter -timeout=6h - -BASE_URL="http://${BUILDCACHE_SERVER}/images/${CIA_ARCH}/${CIA_VERNUM}" - -run_kola_tests() { - local instance_type="${1}"; shift - local instance_tapfile="${1}"; shift - - timeout --signal=SIGQUIT "${timeout}" \ - kola run \ - --board="${CIA_ARCH}-usr" \ - --basename="ci-${CIA_VERNUM/+/-}-${CIA_ARCH}" \ - --platform=equinixmetal \ - --tapfile="${instance_tapfile}" \ - --parallel="${EQUINIXMETAL_PARALLEL}" \ - --equinixmetal-image-url="${BASE_URL}/${EQUINIXMETAL_IMAGE_NAME}" \ - --equinixmetal-installer-image-kernel-url="${BASE_URL}/${PXE_KERNEL_NAME}" \ - --equinixmetal-installer-image-cpio-url="${BASE_URL}/${PXE_IMAGE_NAME}" \ - --equinixmetal-metro="${equinixmetal_metro}" \ - --equinixmetal-plan="${instance_type}" \ - --equinixmetal-project="${EQUINIXMETAL_PROJECT}" \ - --equinixmetal-storage-url="${EQUINIXMETAL_STORAGE_URL}" \ - --gce-json-key=<(set +x; echo "${GCP_JSON_KEY}" | base64 --decode) \ - --equinixmetal-api-key="${EQUINIXMETAL_KEY}" \ - --image-version "${CIA_VERNUM}" \ - "${@}" -} - -query_kola_tests() { - shift; # ignore the instance type - kola list --platform=equinixmetal --filter "${@}" -} - -run_kola_tests_on_instances \ - "${EQUINIXMETAL_INSTANCE_TYPE}" \ - "${CIA_TAPFILE}" \ - "${CIA_FIRST_RUN}" \ - "${MORE_INSTANCE_TYPES[@]}" \ - '--' \ - 'cl.internet' \ - '--' \ - "${@}"