From 5a55d611064c1aeb37d10685af0a4e29ff2ed6a6 Mon Sep 17 00:00:00 2001 From: Morten Tokle Date: Mon, 5 Aug 2024 15:33:54 +0200 Subject: [PATCH] Remove migration system --- .../src/main/java/com/yahoo/config/provision/SystemName.java | 5 +---- .../test/java/com/yahoo/config/provision/SystemNameTest.java | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java index ec2ad6416774..f73fec3ec68e 100644 --- a/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java +++ b/config-provisioning/src/main/java/com/yahoo/config/provision/SystemName.java @@ -25,7 +25,6 @@ public enum SystemName { /** Continuous deployment system for testing the Public system */ PublicCd(true, true), - PublicCdMigration(true, true), /** Local development system */ dev(false, false); @@ -49,7 +48,6 @@ public static SystemName from(String value) { case "main": return main; case "public": return Public; case "publiccd": return PublicCd; - case "publiccdmigration": return PublicCdMigration; default: throw new IllegalArgumentException(String.format("'%s' is not a valid system", value)); } } @@ -61,7 +59,6 @@ public String value() { case main: return "main"; case Public: return "public"; case PublicCd: return "publiccd"; - case PublicCdMigration: return "publiccdmigration"; default : throw new IllegalStateException(); } } @@ -78,6 +75,6 @@ public static Set allOf(Predicate predicate) { return Stream.of(values()).filter(predicate).collect(Collectors.toUnmodifiableSet()); } - public static Set hostedVespa() { return EnumSet.of(main, cd, Public, PublicCd, PublicCdMigration); } + public static Set hostedVespa() { return EnumSet.of(main, cd, Public, PublicCd); } } diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java index 0e3e2b105318..2db395caece8 100644 --- a/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java +++ b/config-provisioning/src/test/java/com/yahoo/config/provision/SystemNameTest.java @@ -20,7 +20,7 @@ void test() { @Test void allOf() { - assertEquals(Set.of(SystemName.cd, SystemName.PublicCd, SystemName.PublicCdMigration), SystemName.allOf(SystemName::isCd)); - assertEquals(Set.of(SystemName.PublicCd, SystemName.Public, SystemName.PublicCdMigration), SystemName.allOf(SystemName::isPublic)); + assertEquals(Set.of(SystemName.cd, SystemName.PublicCd), SystemName.allOf(SystemName::isCd)); + assertEquals(Set.of(SystemName.PublicCd, SystemName.Public), SystemName.allOf(SystemName::isPublic)); } }