Merge pull request #1360 from guardian/aa/rm-teamcity

Remove TeamCity
guardian · Dec 18, 2023 · 99eb293 · 99eb293
2 parents 4566492 + b10afaf
commit 99eb293
Show file tree

Hide file tree

Showing 14 changed files with 4 additions and 295 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 AMIgo is an application for baking AMIs (Amazon Machine Images).
 For information on how to use Amigo baked AMIs with Riffraff check [here](./docs/riffraff-integration.md).
-This project is built in [teamcity](https://teamcity.gutools.co.uk/buildConfiguration/Tools_Amigo).
+This project is built with GitHub Actions.
 
 ## Terminology
 

diff --git a/app/housekeeping/MarkOldUnusedBakesForDeletion.scala b/app/housekeeping/MarkOldUnusedBakesForDeletion.scala
@@ -24,16 +24,10 @@ object MarkOldUnusedBakesForDeletion {
       duration.getStandardDays > MAX_AGE
     }
 
-    // Exclude TeamCity Agent AMIs, which have been incorrectly assumed to be unused in the past. This happens
-    // because TeamCity Agents are typically terminated overnight and are not linked to a launch configuration.
-    val oldBakesExcludingTeamCityAgents = oldBakes.filterNot { bake =>
-      bake.recipe.id.value.startsWith("teamcity-agent")
-    }
-
-    val recipeUsage = getRecipeUsage(oldBakesExcludingTeamCityAgents)
+    val recipeUsage = getRecipeUsage(oldBakes)
     val usedBakes = recipeUsage.bakeUsage.map(_.bake).distinct.toSet
 
-    oldBakesExcludingTeamCityAgents -- usedBakes
+    oldBakes -- usedBakes
   }
 }
 

diff --git a/build.sbt b/build.sbt
@@ -49,7 +49,7 @@ lazy val root = (project in file("."))
       lazy val buildInfo = BuildInfo(baseDirectory.value)
 
       // so this next one is constant to avoid it always recompiling on dev machines.
-      // we only really care about build time on teamcity, when a constant based on when
+      // we only really care about build time in CI, when a constant based on when
       // it was loaded is just fine
       lazy val buildTime: String = DateTimeFormatter.ISO_OFFSET_DATE_TIME
         .format(ZonedDateTime.now(ZoneId.of("UTC")))

diff --git a/roles/teamcity-agent/README.md b/roles/teamcity-agent/README.md
diff --git a/roles/teamcity-agent/defaults/main.yml b/roles/teamcity-agent/defaults/main.yml
diff --git a/roles/teamcity-agent/files/awsconfig_cleanup.sh b/roles/teamcity-agent/files/awsconfig_cleanup.sh
diff --git a/roles/teamcity-agent/files/install_vars b/roles/teamcity-agent/files/install_vars
diff --git a/roles/teamcity-agent/files/teamcityagent.service b/roles/teamcity-agent/files/teamcityagent.service
diff --git a/roles/teamcity-agent/meta/main.yml b/roles/teamcity-agent/meta/main.yml
diff --git a/roles/teamcity-agent/tasks/main.yml b/roles/teamcity-agent/tasks/main.yml
diff --git a/roles/teamcity-ivy-cache/README.md b/roles/teamcity-ivy-cache/README.md
diff --git a/roles/teamcity-ivy-cache/files/sync-ivy-cache b/roles/teamcity-ivy-cache/files/sync-ivy-cache
diff --git a/roles/teamcity-ivy-cache/tasks/main.yml b/roles/teamcity-ivy-cache/tasks/main.yml
diff --git a/test/housekeeping/MarkOldUnusedBakesForDeletionSpec.scala b/test/housekeeping/MarkOldUnusedBakesForDeletionSpec.scala
@@ -147,24 +147,4 @@ class MarkOldUnusedBakesForDeletionSpec extends AnyFlatSpec with Matchers {
     markedBakes.size shouldEqual 1
     markedBakes.map(_.bakeId) shouldEqual Set(BakeId(RecipeId("recipe-1"), 1))
   }
-
-  it should "not include TeamCity agent AMIs, even if they are old" in {
-    val housekeepingDate = new DateTime(2018, 7, 12, 0, 0, 0, DateTimeZone.UTC)
-    val recipeIds = Set(RecipeId("teamcity-agent-focal"))
-    val oldTeamCityAgent = fixtureBake(
-      fixtureRecipe("teamcity-agent-focal", oldDate),
-      Some(AmiId("ami-1")),
-      oldDate
-    )
-    def getBakesWithTeamCityAgent(recipeId: RecipeId): Iterable[Bake] =
-      Iterable(oldTeamCityAgent)
-    val markedBakes = MarkOldUnusedBakesForDeletion.getOldUnusedBakes(
-      recipeIds,
-      housekeepingDate,
-      getBakesWithTeamCityAgent,
-      getEmptyRecipeUsage
-    )
-
-    markedBakes.size shouldEqual 0
-  }
 }