From c610200cd72a18ebbfcffacfe738bf484e9a18c9 Mon Sep 17 00:00:00 2001 From: Patrick Clay Date: Wed, 20 Nov 2024 17:44:59 -0800 Subject: [PATCH] Remove obsolete cos101 from PKB. PiperOrigin-RevId: 698581096 --- CHANGES.next.md | 7 ++++--- perfkitbenchmarker/os_types.py | 6 ++---- perfkitbenchmarker/providers/gcp/gce_virtual_machine.py | 6 ------ 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CHANGES.next.md b/CHANGES.next.md index 6c7b53995..a1d9556a3 100644 --- a/CHANGES.next.md +++ b/CHANGES.next.md @@ -90,6 +90,7 @@ - Make Ubuntu 24 the default os_type. ### New features: + - Add support for TimescaleDB - Add support for Omni - Add support for systems running fedora36 and fedora37 @@ -172,7 +173,7 @@ - Add support for multi-network creation/attachment. PKB currently does not handle subnet creation on an existing network. - Add support for GCE Confidential VM's. -- Add cos-dev, cost109, cos105, and cos101 OS support for GCP. +- Add cos-dev, cost109, and cos105 OS support for GCP. - Add --object_ttl_days flag for lifecycle management of created buckets. - Add support for multi-NIC netperf throughput on AWS. - Added AWS/GCP support for Data Plane Development Kit (DPDK) on Linux VM's to @@ -204,8 +205,8 @@ - Use Artifact Registry instead of the deprecated Google Container Registry - Add `--capture_vm_logs` flag, which prompts PKB to capture `syslog`, `journalctl`, and `sos report` (if supported) logs from Linux test VMs. -- Add `--vm_log_bucket` flag, offering users the option to upload the - logs captured via the `--capture_vm_logs` flag to a GCS bucket. +- Add `--vm_log_bucket` flag, offering users the option to upload the logs + captured via the `--capture_vm_logs` flag to a GCS bucket. - Add chromium_compile_benchmark. - Add unmanaged_postgresql_sysbench benchmark. diff --git a/perfkitbenchmarker/os_types.py b/perfkitbenchmarker/os_types.py index 2f2e4c058..e001053a1 100644 --- a/perfkitbenchmarker/os_types.py +++ b/perfkitbenchmarker/os_types.py @@ -20,11 +20,10 @@ AMAZON_NEURON = 'amazon_neuron' CENTOS_STREAM9 = 'centos_stream9' CLEAR = 'clear' -COS = 'cos' # stable +COS = 'cos' +COS_DEV = 'cos_dev' COS109 = 'cos109' COS105 = 'cos105' -COS101 = 'cos101' -COS_DEV = 'cos_dev' CORE_OS = 'core_os' DEBIAN11 = 'debian11' DEBIAN11_BACKPORTS = 'debian11_backports' @@ -89,7 +88,6 @@ COS, COS109, COS105, - COS101, COS_DEV, ] diff --git a/perfkitbenchmarker/providers/gcp/gce_virtual_machine.py b/perfkitbenchmarker/providers/gcp/gce_virtual_machine.py index 1fcc35d16..38c910a3b 100644 --- a/perfkitbenchmarker/providers/gcp/gce_virtual_machine.py +++ b/perfkitbenchmarker/providers/gcp/gce_virtual_machine.py @@ -1773,12 +1773,6 @@ class Cos105BasedGceVirtualMachine(BaseCosBasedGceVirtualMachine): DEFAULT_ARM_IMAGE_FAMILY = 'cos-arm64-105-lts' -class Cos101BasedGceVirtualMachine(BaseCosBasedGceVirtualMachine): - OS_TYPE = os_types.COS101 - DEFAULT_X86_IMAGE_FAMILY = 'cos-101-lts' - DEFAULT_ARM_IMAGE_FAMILY = 'cos-arm64-101-lts' - - class CoreOsBasedGceVirtualMachine( BaseLinuxGceVirtualMachine, linux_vm.CoreOsMixin ):