Update jetty console static files cache policies (#2731 )

Downgrade node type for pubapi and console, enable bursting for frontend and backend (#2723 )
Remove user FKs from console history tables (#2729 )
2026-07-15 04:22:24 +00:00 · 2025-03-28 19:53:02 +00:00 · 2025-03-28 19:14:33 +00:00 · 2025-03-25 20:47:47 +00:00 · 2025-03-25 19:36:52 +00:00 · 2025-03-24 15:52:12 +00:00
21 changed files with 4625 additions and 4916 deletions
@@ -25,7 +25,11 @@ import textwrap
 import re

 # We should never analyze any generated files
-UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/", ".git/", ".gradle/", "/dist/", "/console-alpha/", "/console-crash/", "/console-qa", "/console-sandbox", "/console-production", "karma.conf.js", "polyfills.ts", "test.ts", "/docs/console-endpoints/"}
+UNIVERSALLY_SKIPPED_PATTERNS = {"/build/", "cloudbuild-caches", "/out/", ".git/",
+     ".gradle/", "/dist/", "/console-alpha/", "/console-crash/", "/console-qa",
+     "/console-sandbox", "/console-production", "karma.conf.js", "polyfills.ts",
+     "test.ts", "/docs/console-endpoints/", "/bin/generated-sources/",
+     "/bin/generated-test-sources/", "src/main/generated", "src/test/generated"}
 # We can't rely on CI to have the Enum package installed so we do this instead.
 FORBIDDEN = 1
 REQUIRED = 2
@@ -87,11 +91,9 @@ PRESUBMITS = {
    PresubmitCheck(
        r".*Copyright 20\d{2} The Nomulus Authors\. All Rights Reserved\.",
        ("java", "js", "soy", "sql", "py", "sh", "gradle", "ts"), {
-            ".git", "/build/", "/bin/generated-sources/", "/bin/generated-test-sources/",
-            "node_modules/", "LoggerConfig.java", "registrar_bin.",
+            ".git", "/build/", "node_modules/", "LoggerConfig.java", "registrar_bin.",
            "registrar_dbg.", "google-java-format-diff.py",
-            "nomulus.golden.sql", "soyutils_usegoog.js", "javascript/checks.js",
-            "/src/main/generated", "/src/test/generated"
+            "nomulus.golden.sql", "soyutils_usegoog.js", "javascript/checks.js"
        }, REQUIRED):
        "File did not include the license header.",

@@ -13,7 +13,7 @@
 // limitations under the License.

 import { Injectable } from '@angular/core';
-import { switchMap, timeout } from 'rxjs';
+import { switchMap } from 'rxjs';
 import {
  IpAllowListItem,
  RegistrarService,
@@ -69,7 +69,6 @@ export class SecurityService {
        uiToApiConverter(newSecuritySettings)
      )
      .pipe(
-        timeout(2000),
        switchMap(() => {
          return this.registrarService.loadRegistrars();
        })
@@ -78,7 +78,7 @@ public class ExportDomainListsAction implements Runnable {
        ORDER BY d.domain_name""";

  // This may be a CSV, but it is uses a .txt file extension for back-compatibility
-  static final String REGISTERED_DOMAINS_FILENAME = "registered_domains.txt";
+  static final String REGISTERED_DOMAINS_FILENAME_FORMAT = "registered_domains_%s.txt";

  @Inject Clock clock;
  @Inject DriveConnection driveConnection;
@@ -146,7 +146,7 @@ public class ExportDomainListsAction implements Runnable {
      } else {
        String resultMsg =
            driveConnection.createOrUpdateFile(
-                REGISTERED_DOMAINS_FILENAME,
+                String.format(REGISTERED_DOMAINS_FILENAME_FORMAT, tldStr),
                MediaType.PLAIN_TEXT_UTF_8,
                tld.getDriveFolderId(),
                domains.getBytes(UTF_8));
@@ -43,7 +43,7 @@ public class ExportReservedTermsAction implements Runnable {

  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
  static final MediaType EXPORT_MIME_TYPE = MediaType.PLAIN_TEXT_UTF_8;
-  static final String RESERVED_TERMS_FILENAME = "reserved_terms.txt";
+  static final String RESERVED_TERMS_FILENAME_FORMAT = "reserved_terms_%s.txt";

  @Inject DriveConnection driveConnection;
  @Inject ExportUtils exportUtils;
@@ -79,7 +79,7 @@ public class ExportReservedTermsAction implements Runnable {
      } else {
        resultMsg =
            driveConnection.createOrUpdateFile(
-                RESERVED_TERMS_FILENAME,
+                String.format(RESERVED_TERMS_FILENAME_FORMAT, tldStr),
                EXPORT_MIME_TYPE,
                tld.getDriveFolderId(),
                exportUtils.exportReservedTerms(tld).getBytes(UTF_8));
@@ -15,7 +15,6 @@
 package google.registry.export;

 import static com.google.common.truth.Truth.assertThat;
-import static google.registry.export.ExportDomainListsAction.REGISTERED_DOMAINS_FILENAME;
 import static google.registry.model.common.FeatureFlag.FeatureName.INCLUDE_PENDING_DELETE_DATE_FOR_DOMAINS;
 import static google.registry.model.common.FeatureFlag.FeatureStatus.ACTIVE;
 import static google.registry.model.common.FeatureFlag.FeatureStatus.INACTIVE;
@@ -83,10 +82,11 @@ class ExportDomainListsActionTest {
    persistFeatureFlag(INACTIVE);
  }

-  private void verifyExportedToDrive(String folderId, String domains) throws Exception {
+  private void verifyExportedToDrive(String folderId, String filename, String domains)
+      throws Exception {
    verify(driveConnection)
        .createOrUpdateFile(
-            eq(REGISTERED_DOMAINS_FILENAME),
+            eq(filename),
            eq(MediaType.PLAIN_TEXT_UTF_8),
            eq(folderId),
            bytesExportedToDrive.capture());
@@ -103,7 +103,7 @@ class ExportDomainListsActionTest {
    String tlds = new String(gcsUtils.readBytesFrom(existingFile), UTF_8);
    // Check that it only contains the active domains, not the dead one.
    assertThat(tlds).isEqualTo("onetwo.tld\nrudnitzky.tld");
-    verifyExportedToDrive("brouhaha", "onetwo.tld\nrudnitzky.tld");
+    verifyExportedToDrive("brouhaha", "registered_domains_tld.txt", "onetwo.tld\nrudnitzky.tld");
    verifyNoMoreInteractions(driveConnection);
  }

@@ -118,7 +118,7 @@ class ExportDomainListsActionTest {
    String tlds = new String(gcsUtils.readBytesFrom(existingFile), UTF_8);
    // Check that it only contains the active domains, not the dead one.
    assertThat(tlds).isEqualTo("onetwo.tld,\nrudnitzky.tld,");
-    verifyExportedToDrive("brouhaha", "onetwo.tld,\nrudnitzky.tld,");
+    verifyExportedToDrive("brouhaha", "registered_domains_tld.txt", "onetwo.tld,\nrudnitzky.tld,");
    verifyNoMoreInteractions(driveConnection);
  }

@@ -137,7 +137,7 @@ class ExportDomainListsActionTest {
    assertThrows(StorageException.class, () -> gcsUtils.readBytesFrom(nonexistentFile));
    ImmutableList<String> ls = gcsUtils.listFolderObjects("outputbucket", "");
    assertThat(ls).containsExactly("tld.txt");
-    verifyExportedToDrive("brouhaha", "onetwo.tld\nrudnitzky.tld");
+    verifyExportedToDrive("brouhaha", "registered_domains_tld.txt", "onetwo.tld\nrudnitzky.tld");
    verifyNoMoreInteractions(driveConnection);
  }

@@ -157,7 +157,7 @@ class ExportDomainListsActionTest {
    assertThrows(StorageException.class, () -> gcsUtils.readBytesFrom(nonexistentFile));
    ImmutableList<String> ls = gcsUtils.listFolderObjects("outputbucket", "");
    assertThat(ls).containsExactly("tld.txt");
-    verifyExportedToDrive("brouhaha", "onetwo.tld,\nrudnitzky.tld,");
+    verifyExportedToDrive("brouhaha", "registered_domains_tld.txt", "onetwo.tld,\nrudnitzky.tld,");
    verifyNoMoreInteractions(driveConnection);
  }

@@ -189,7 +189,9 @@ class ExportDomainListsActionTest {
    action.run();

    verifyExportedToDrive(
-        "brouhaha", "active.tld,\npendingdelete.tld,2020-02-05T02:02:02.000Z\nredemption.tld,");
+        "brouhaha",
+        "registered_domains_tld.txt",
+        "active.tld,\npendingdelete.tld,2020-02-05T02:02:02.000Z\nredemption.tld,");
  }

  @Test
@@ -215,8 +217,9 @@ class ExportDomainListsActionTest {
    BlobId thirdTldFile = BlobId.of("outputbucket", "tldthree.txt");
    String evenMoreTlds = new String(gcsUtils.readBytesFrom(thirdTldFile), UTF_8).trim();
    assertThat(evenMoreTlds).isEqualTo("cupid.tldthree");
-    verifyExportedToDrive("brouhaha", "dasher.tld\nprancer.tld");
-    verifyExportedToDrive("hooray", "buddy.tldtwo\nrudolph.tldtwo\nsanta.tldtwo");
+    verifyExportedToDrive("brouhaha", "registered_domains_tld.txt", "dasher.tld\nprancer.tld");
+    verifyExportedToDrive(
+        "hooray", "registered_domains_tldtwo.txt", "buddy.tldtwo\nrudolph.tldtwo\nsanta.tldtwo");
    // tldthree does not have a drive id, so no export to drive is performed.
    verifyNoMoreInteractions(driveConnection);
  }
@@ -245,8 +248,9 @@ class ExportDomainListsActionTest {
    BlobId thirdTldFile = BlobId.of("outputbucket", "tldthree.txt");
    String evenMoreTlds = new String(gcsUtils.readBytesFrom(thirdTldFile), UTF_8).trim();
    assertThat(evenMoreTlds).isEqualTo("cupid.tldthree,");
-    verifyExportedToDrive("brouhaha", "dasher.tld,\nprancer.tld,");
-    verifyExportedToDrive("hooray", "buddy.tldtwo,\nrudolph.tldtwo,\nsanta.tldtwo,");
+    verifyExportedToDrive("brouhaha", "registered_domains_tld.txt", "dasher.tld,\nprancer.tld,");
+    verifyExportedToDrive(
+        "hooray", "registered_domains_tldtwo.txt", "buddy.tldtwo,\nrudolph.tldtwo,\nsanta.tldtwo,");
    // tldthree does not have a drive id, so no export to drive is performed.
    verifyNoMoreInteractions(driveConnection);
  }
@@ -16,7 +16,6 @@ package google.registry.export;

 import static com.google.common.truth.Truth.assertThat;
 import static google.registry.export.ExportReservedTermsAction.EXPORT_MIME_TYPE;
-import static google.registry.export.ExportReservedTermsAction.RESERVED_TERMS_FILENAME;
 import static google.registry.testing.DatabaseHelper.createTld;
 import static google.registry.testing.DatabaseHelper.persistReservedList;
 import static google.registry.testing.DatabaseHelper.persistResource;
@@ -77,7 +76,7 @@ public class ExportReservedTermsActionTest {
    runAction("tld");
    byte[] expected = "# This is a disclaimer.\ncat\nlol\n".getBytes(UTF_8);
    verify(driveConnection)
-        .createOrUpdateFile(RESERVED_TERMS_FILENAME, EXPORT_MIME_TYPE, "brouhaha", expected);
+        .createOrUpdateFile("reserved_terms_tld.txt", EXPORT_MIME_TYPE, "brouhaha", expected);
    assertThat(response.getStatus()).isEqualTo(SC_OK);
    assertThat(response.getPayload()).isEqualTo("1001");
  }
@@ -185,3 +185,7 @@ V184__remove_fk_pollmessage_domainhistory.sql
 V185__remove_fk_domaintransactionrecord_domainhistory.sql
 V186__remove_fk_domaindsdatahistory_domainhistory.sql
 V187__console_update_history.sql
+V188__remove_fk_userupdatehistory.sql
+V189__remove_fk_consoleeppactionhistory.sql
+V190__remove_fk_registrarupdatehistory.sql
+V191__remove_fk_registrarpocupdatehistory.sql
@@ -0,0 +1,16 @@
+-- Copyright 2025 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+ALTER TABLE "UserUpdateHistory" DROP CONSTRAINT fk1s7bopbl3pwrhv3jkkofnv3o0;
+ALTER TABLE "UserUpdateHistory" DROP CONSTRAINT fkuserupdatehistoryemailaddress;
@@ -0,0 +1,15 @@
+-- Copyright 2025 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+ALTER TABLE "ConsoleEppActionHistory" DROP CONSTRAINT fkb686b9os2nsjpv930npa4r3b4;
@@ -0,0 +1,15 @@
+-- Copyright 2025 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+ALTER TABLE "RegistrarUpdateHistory" DROP CONSTRAINT fksr7w342s7x5s5jvdti2axqeq8;
@@ -0,0 +1,15 @@
+-- Copyright 2025 The Nomulus Authors. All Rights Reserved.
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+
+ALTER TABLE "RegistrarPocUpdateHistory" DROP CONSTRAINT fkftpbwctxtkc1i0njc0tdcaa2g;
@@ -2614,14 +2614,6 @@ CREATE INDEX spec11threatmatch_registrar_id_idx ON public."Spec11ThreatMatch" US
 CREATE INDEX spec11threatmatch_tld_idx ON public."Spec11ThreatMatch" USING btree (tld);


--
-- Name: UserUpdateHistory fk1s7bopbl3pwrhv3jkkofnv3o0; Type: FK CONSTRAINT; Schema: public; Owner: -
--
-
-ALTER TABLE ONLY public."UserUpdateHistory"
-    ADD CONSTRAINT fk1s7bopbl3pwrhv3jkkofnv3o0 FOREIGN KEY (history_acting_user) REFERENCES public."User"(email_address);
-
-
 --
 -- Name: Contact fk1sfyj7o7954prbn1exk7lpnoe; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3070,14 +3062,6 @@ ALTER TABLE ONLY public."DomainHistoryHost"
    ADD CONSTRAINT fka9woh3hu8gx5x0vly6bai327n FOREIGN KEY (domain_history_domain_repo_id, domain_history_history_revision_id) REFERENCES public."DomainHistory"(domain_repo_id, history_revision_id) DEFERRABLE INITIALLY DEFERRED;


--
-- Name: ConsoleEppActionHistory fkb686b9os2nsjpv930npa4r3b4; Type: FK CONSTRAINT; Schema: public; Owner: -
--
-
-ALTER TABLE ONLY public."ConsoleEppActionHistory"
-    ADD CONSTRAINT fkb686b9os2nsjpv930npa4r3b4 FOREIGN KEY (history_acting_user) REFERENCES public."User"(email_address);
-
-
 --
 -- Name: BsaUnblockableDomain fkbsaunblockabledomainlabel; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3094,14 +3078,6 @@ ALTER TABLE ONLY public."DomainHost"
    ADD CONSTRAINT fkfmi7bdink53swivs390m2btxg FOREIGN KEY (domain_repo_id) REFERENCES public."Domain"(repo_id) DEFERRABLE INITIALLY DEFERRED;


--
-- Name: RegistrarPocUpdateHistory fkftpbwctxtkc1i0njc0tdcaa2g; Type: FK CONSTRAINT; Schema: public; Owner: -
--
-
-ALTER TABLE ONLY public."RegistrarPocUpdateHistory"
-    ADD CONSTRAINT fkftpbwctxtkc1i0njc0tdcaa2g FOREIGN KEY (history_acting_user) REFERENCES public."User"(email_address);
-
-
 --
 -- Name: ReservedEntry fkgq03rk0bt1hb915dnyvd3vnfc; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3150,14 +3126,6 @@ ALTER TABLE ONLY public."RegistrarUpdateHistory"
    ADD CONSTRAINT fkregistrarupdatehistoryregistrarid FOREIGN KEY (registrar_id) REFERENCES public."Registrar"(registrar_id);


--
-- Name: RegistrarUpdateHistory fksr7w342s7x5s5jvdti2axqeq8; Type: FK CONSTRAINT; Schema: public; Owner: -
--
-
-ALTER TABLE ONLY public."RegistrarUpdateHistory"
-    ADD CONSTRAINT fksr7w342s7x5s5jvdti2axqeq8 FOREIGN KEY (history_acting_user) REFERENCES public."User"(email_address);
-
-
 --
 -- Name: DelegationSignerData fktr24j9v14ph2mfuw2gsmt12kq; Type: FK CONSTRAINT; Schema: public; Owner: -
 --
@@ -3166,14 +3134,6 @@ ALTER TABLE ONLY public."DelegationSignerData"
    ADD CONSTRAINT fktr24j9v14ph2mfuw2gsmt12kq FOREIGN KEY (domain_repo_id) REFERENCES public."Domain"(repo_id) DEFERRABLE INITIALLY DEFERRED;


--
-- Name: UserUpdateHistory fkuserupdatehistoryemailaddress; Type: FK CONSTRAINT; Schema: public; Owner: -
--
-
-ALTER TABLE ONLY public."UserUpdateHistory"
-    ADD CONSTRAINT fkuserupdatehistoryemailaddress FOREIGN KEY (email_address) REFERENCES public."User"(email_address);
-
-
 --
 -- PostgreSQL database dump complete
 --
@@ -38,7 +38,7 @@ dependencies {

 tasks.register('copyConsole', Copy) {
    from("${rootDir}/console-webapp/staged/") {
-        include "console-*/*"
+        include "console-*/", "console-*/**"
    }
    into layout.buildDirectory.dir('jetty-base/webapps/')
    dependsOn(':console-webapp:buildConsoleForAll')
@@ -16,6 +16,7 @@ spec:
      serviceAccountName: nomulus
      nodeSelector:
        cloud.google.com/compute-class: "Performance"
+        cloud.google.com/machine-family: c4
      containers:
      - name: backend
        image: gcr.io/GCP_PROJECT/nomulus
@@ -14,8 +14,6 @@ spec:
        service: console
    spec:
      serviceAccountName: nomulus
-      nodeSelector:
-        cloud.google.com/compute-class: "Performance"
      containers:
      - name: console
        image: gcr.io/GCP_PROJECT/nomulus
@@ -24,8 +22,17 @@ spec:
          name: http
        resources:
          requests:
+            # explicit pod-slots 0 is required in order to downgrade node 
+            # class from performance, which has implicit pod-slots 1
+            cloud.google.com/pod-slots: 0
            cpu: "100m"
            memory: "512Mi"
+          limits:
+            # explicit pod-slots 0 is required in order to downgrade node 
+            # class from performance, which has implicit pod-slots 1
+            cloud.google.com/pod-slots: 0
+            cpu: "500m"
+            memory: "2Gi"
        args: [ENVIRONMENT]
        env:
        - name: POD_ID
@@ -16,6 +16,7 @@ spec:
      serviceAccountName: nomulus
      nodeSelector:
        cloud.google.com/compute-class: "Performance"
+        cloud.google.com/machine-family: c4
      containers:
      - name: frontend
        image: gcr.io/GCP_PROJECT/nomulus
@@ -14,8 +14,6 @@ spec:
        service: pubapi
    spec:
      serviceAccountName: nomulus
-      nodeSelector:
-        cloud.google.com/compute-class: "Performance"
      containers:
      - name: pubapi
        image: gcr.io/GCP_PROJECT/nomulus
@@ -24,8 +22,17 @@ spec:
          name: http
        resources:
          requests:
+            # explicit pod-slots 0 is required in order to downgrade node 
+            # class from performance, which has implicit pod-slots 1
+            cloud.google.com/pod-slots: 0
            cpu: "100m"
            memory: "512Mi"
+          limits:
+            # explicit pod-slots 0 is required in order to downgrade node 
+            # class from performance, which has implicit pod-slots 1
+            cloud.google.com/pod-slots: 0
+            cpu: "500m"
+            memory: "2Gi"
        args: [ENVIRONMENT]
        env:
        - name: POD_ID
@@ -0,0 +1,54 @@
+<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"
+            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_5_0.xsd"
+            version="5.0">
+
+        <servlet>
+            <servlet-name>default-no-cache</servlet-name>
+            <servlet-class>org.eclipse.jetty.ee10.servlet.DefaultServlet</servlet-class>
+            <init-param>
+                <param-name>cacheControl</param-name>
+                <param-value>no-cache, no-store, must-revalidate</param-value>
+            </init-param>
+        </servlet>
+
+        <servlet>
+            <servlet-name>default-cache-static</servlet-name>
+            <servlet-class>org.eclipse.jetty.ee10.servlet.DefaultServlet</servlet-class>
+            <init-param>
+                <param-name>cacheControl</param-name>
+                <param-value>public, max-age=604800</param-value>
+            </init-param>
+        </servlet>
+
+        <servlet-mapping>
+            <servlet-name>default-no-cache</servlet-name>
+            <url-pattern>*.html</url-pattern>
+        </servlet-mapping>
+
+        <servlet-mapping>
+            <servlet-name>default-no-cache</servlet-name>
+            <url-pattern>main.js</url-pattern>
+        </servlet-mapping>
+
+        <servlet-mapping>
+            <servlet-name>default-no-cache</servlet-name>
+            <url-pattern>styles.css</url-pattern>
+        </servlet-mapping>
+
+        <servlet-mapping>
+            <servlet-name>default-cache-static</servlet-name>
+            <url-pattern>*.css</url-pattern>
+        </servlet-mapping>
+
+        <servlet-mapping>
+            <servlet-name>default-cache-static</servlet-name>
+            <url-pattern>*.js</url-pattern>
+        </servlet-mapping>
+
+        <servlet-mapping>
+            <servlet-name>default-cache-static</servlet-name>
+            <url-pattern>*.png</url-pattern>
+        </servlet-mapping>
+
+</web-app>
@@ -15,7 +15,11 @@

 env=${1:-"alpha"}
 cd /jetty-base
-cp -rf webapps/console-${env} webapps/console
+cp -rf webapps/console-${env}/. webapps/console/
+cd webapps
+# Remove all environment builds not used in the deployment
+find . -maxdepth 1 -type d -name "console-*" -exec rm -rf {} +
+cd /jetty-base
 echo "Running ${env}"
 java -Dgoogle.registry.environment=${env} \
    -Djava.util.logging.config.file=/logging.properties \
Author	SHA1	Message	Date
Pavlo Tkach	2d072c3844	Update jetty console static files cache policies (#2731 )	2025-03-28 19:53:02 +00:00
Pavlo Tkach	c15dec4419	Downgrade node type for pubapi and console, enable bursting for frontend and backend (#2723 )	2025-03-28 19:14:33 +00:00
gbrodman	8340125bf4	Remove user FKs from console history tables (#2729 ) This, obviously, can mess up user deletion	2025-03-25 20:47:47 +00:00
Pavlo Tkach	98ba80d94e	Remove console security settings timeout (#2728 )	2025-03-25 19:36:52 +00:00
gbrodman	967d04efce	Include TLD in reserved/registered lists too (#2725 ) We already do this for premium terms, but it's nice to do it for the other list types too https://b.corp.google.com/issues/390053672	2025-03-24 15:52:12 +00:00