Merge branch 'main' into al-bump-cmp-commerical

build.sbt

@@ -1,4 +1,3 @@
-import com.gu.riffraff.artifact.RiffRaffArtifact.autoImport._
 import play.sbt.routes.RoutesKeys
 import com.typesafe.sbt.web.SbtWeb.autoImport._
 import com.gu.Dependencies._
@@ -238,32 +237,6 @@ val main = root()
     preview,
     rss,
   )
-  .settings(
-    riffRaffUploadArtifactBucket := Some(
-      System.getenv().getOrDefault("RIFF_RAFF_ARTIFACT_BUCKET", "aws-frontend-teamcity"),
-    ),
-    riffRaffUploadManifestBucket := Some(
-      System.getenv().getOrDefault("RIFF_RAFF_BUILD_BUCKET", "aws-frontend-teamcity"),
-    ),
-    riffRaffManifestProjectName := "dotcom:all",
-    riffRaffArtifactResources := Seq(
-      (admin / Universal / packageBin).value -> s"${(admin / name).value}/${(admin / Universal / packageBin).value.getName}",
-      (applications / Universal / packageBin).value -> s"${(applications / name).value}/${(applications / Universal / packageBin).value.getName}",
-      (archive / Universal / packageBin).value -> s"${(archive / name).value}/${(archive / Universal / packageBin).value.getName}",
-      (article / Universal / packageBin).value -> s"${(article / name).value}/${(article / Universal / packageBin).value.getName}",
-      (commercial / Universal / packageBin).value -> s"${(commercial / name).value}/${(commercial / Universal / packageBin).value.getName}",
-      (diagnostics / Universal / packageBin).value -> s"${(diagnostics / name).value}/${(diagnostics / Universal / packageBin).value.getName}",
-      (discussion / Universal / packageBin).value -> s"${(discussion / name).value}/${(discussion / Universal / packageBin).value.getName}",
-      (identity / Universal / packageBin).value -> s"${(identity / name).value}/${(identity / Universal / packageBin).value.getName}",
-      (facia / Universal / packageBin).value -> s"${(facia / name).value}/${(facia / Universal / packageBin).value.getName}",
-      (faciaPress / Universal / packageBin).value -> s"${(faciaPress / name).value}/${(faciaPress / Universal / packageBin).value.getName}",
-      (onward / Universal / packageBin).value -> s"${(onward / name).value}/${(onward / Universal / packageBin).value.getName}",
-      (preview / Universal / packageBin).value -> s"${(preview / name).value}/${(preview / Universal / packageBin).value.getName}",
-      (rss / Universal / packageBin).value -> s"${(rss / name).value}/${(rss / Universal / packageBin).value.getName}",
-      (sport / Universal / packageBin).value -> s"${(sport / name).value}/${(sport / Universal / packageBin).value.getName}",
-      baseDirectory.value / "riff-raff.yaml" -> "riff-raff.yaml",
-    ),
-  )
 val badgeHash = inputKey[Unit]("Generate special badge salts and hashes")
 badgeHash := {
   import java.math.BigInteger

common/app/common/configuration.scala

@@ -339,11 +339,6 @@ class GuardianConfiguration extends GuLogging {
     lazy val token = configuration.getStringProperty("github.token")
   }
 
-  object teamcity {
-    lazy val host = configuration.getMandatoryStringProperty("teamcity.host")
-    lazy val internalHost = configuration.getMandatoryStringProperty("teamcity.internalhost")
-  }
-
   object ajax {
     lazy val url = configuration.getStringProperty("ajax.url").getOrElse("")
     lazy val nonSecureUrl =

common/app/conf/switches/CommercialSwitches.scala

@@ -158,6 +158,16 @@ trait CommercialSwitches {
     sellByDate = never,
     exposeClientSide = true,
   )
+
+  val frontsBannerAds: Switch = Switch(
+    group = Commercial,
+    name = "fronts-banner-ads",
+    description = "Enable banner ads to display instead of MPUs and merch-high on fronts pages.",
+    owners = group(Commercial),
+    safeState = Off,
+    sellByDate = never,
+    exposeClientSide = true,
+  )
 }
 
 trait PrebidSwitches {

common/app/experiments/Experiments.scala

@@ -15,7 +15,6 @@ object ActiveExperiments extends ExperimentsDefinition {
       Lightbox,
       ServerSideLiveblogInlineAds,
       OphanEsm,
-      SectionFrontsBannerAds,
       HeaderTopBarSearchCapi,
       AdaptiveSite,
       OfferHttp3,
@@ -42,6 +41,16 @@ object Lightbox
       participationGroup = Perc0B,
     )
 
+object ServerSideLiveblogInlineAds
+    extends Experiment(
+      name = "server-side-liveblog-inline-ads",
+      description =
+        "Test whether we can load liveblog inline ads server-side without negative effects on user experience or revenue",
+      owners = Seq(Owner.withGithub("@guardian/commercial-dev")),
+      sellByDate = LocalDate.of(2023, 11, 1),
+      participationGroup = Perc0C,
+    )
+
 object FrontsBannerAdsDcr
     extends Experiment(
       name = "fronts-banner-ads-dcr",
@@ -75,7 +84,7 @@ object HeaderTopBarSearchCapi
       name = "header-top-bar-search-capi",
       description = "Adds CAPI search to the top nav",
       owners = Seq(Owner.withGithub("@guardian/dotcom-platform")),
-      sellByDate = LocalDate.of(2023, 10, 10),
+      sellByDate = LocalDate.of(2023, 11, 10),
       participationGroup = Perc1B,
     )
 
@@ -88,25 +97,6 @@ object OfferHttp3
       participationGroup = Perc1E,
     )
 
-object ServerSideLiveblogInlineAds
-    extends Experiment(
-      name = "server-side-liveblog-inline-ads",
-      description =
-        "Test whether we can load liveblog inline ads server-side without negative effects on user experience or revenue",
-      owners = Seq(Owner.withGithub("@guardian/commercial-dev")),
-      sellByDate = LocalDate.of(2023, 11, 1),
-      participationGroup = Perc5A,
-    )
-
-object SectionFrontsBannerAds
-    extends Experiment(
-      name = "section-fronts-banner-ads",
-      description = "Creates a new ad experience on section fronts, replacing MPUs with banner ads",
-      owners = Seq(Owner.withGithub("@guardian/commercial-dev")),
-      sellByDate = LocalDate.of(2023, 10, 31),
-      participationGroup = Perc20A,
-    )
-
 object OphanEsm
     extends Experiment(
       name = "ophan-esm",

common/app/services/dotcomrendering/PressedContent.scala

@@ -196,6 +196,7 @@ object PressedContent {
     "/politics/ng-interactive/2019/dec/14/johnson-ascendant-your-general-election-recap",
     "/info/ng-interactive/2019/dec/19/working-report",
     "/cities/ng-interactive/2019/jan/30/high-street-crisis-town-centres-lose-8-of-shops-in-five-years",
+    "/world/ng-interactive/2019/mar/29/a-year-of-bloodshed-at-gaza-border-protests",
     // 2020
     "/artanddesign/ng-interactive/2020/jan/12/mole-man-and-me-sue-webster-artist-home-david-adjaye",
     "/artanddesign/ng-interactive/2020/jan/12/art-into-nature-nature-into-art-cesar-manrique-the-architect-of-lanzarote",

common/conf/env/DEVINFRA.properties

@@ -17,7 +17,6 @@ weather.api.key=none
 
 images.signature-salt=none
 
-teamcity.host=
 riffraff.url=
 
 #general
@@ -106,8 +105,6 @@ weather.api.key=none
 # Radiator
 riffraff.url=https://localhost
 riffraff.apikey=none
-teamcity.host=http://localhost
-teamcity.internalhost=http://localhost
 
 facebook.graphApi.accessToken=fake-access-token