From 8d58408d337eb1eb52936026016e7fbbeaad4993 Mon Sep 17 00:00:00 2001
From: Ian Wahbe <ian@wahbe.com>
Date: Tue, 23 Jan 2024 09:54:11 -0800
Subject: [PATCH] Reduce runner size (#432)

Fixes #433
---
 .ci-mgmt.yaml                              | 5 -----
 .github/workflows/master.yml               | 6 +++---
 .github/workflows/prerelease.yml           | 6 +++---
 .github/workflows/release.yml              | 6 +++---
 .github/workflows/run-acceptance-tests.yml | 4 ++--
 .github/workflows/upgrade-bridge.yml       | 3 +--
 .github/workflows/upgrade-provider.yml     | 1 -
 .upgrade-config.yml                        | 1 -
 8 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml
index 5bfd79a2c..b58892a21 100644
--- a/.ci-mgmt.yaml
+++ b/.ci-mgmt.yaml
@@ -3,11 +3,6 @@ major-version: 4
 upstreamProviderOrg: DataDog
 lint: false
 makeTemplate: bridged
-team: ecosystem
 env:
   DATADOG_APP_KEY: ${{ secrets.DATADOG_APP_KEY }}
   DATADOG_API_KEY: ${{ secrets.DATADOG_API_KEY }}
-javaGenVersion: v0.9.3
-runner:
-  publish: pulumi-ubuntu-8core
-  buildSdk: pulumi-ubuntu-8core
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 4a8ac430c..300e7027a 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -34,7 +34,7 @@ jobs:
   build_sdk:
     name: build_sdk
     needs: prerequisites
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
@@ -271,7 +271,7 @@ jobs:
     needs:
       - test
       - license_check
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
@@ -360,7 +360,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml
index a28543045..3c5ecb1fc 100644
--- a/.github/workflows/prerelease.yml
+++ b/.github/workflows/prerelease.yml
@@ -35,7 +35,7 @@ jobs:
   build_sdk:
     name: build_sdk
     needs: prerequisites
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
@@ -216,7 +216,7 @@ jobs:
     needs:
       - test
       - license_check
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
@@ -287,7 +287,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d35f0b114..eaf365242 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,7 +34,7 @@ jobs:
   build_sdk:
     name: build_sdk
     needs: prerequisites
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
@@ -229,7 +229,7 @@ jobs:
     needs:
       - test
       - license_check
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
@@ -333,7 +333,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
diff --git a/.github/workflows/run-acceptance-tests.yml b/.github/workflows/run-acceptance-tests.yml
index 4d2d83af9..24e25653f 100644
--- a/.github/workflows/run-acceptance-tests.yml
+++ b/.github/workflows/run-acceptance-tests.yml
@@ -42,7 +42,7 @@ jobs:
       github.event.pull_request.head.repo.full_name == github.repository
     name: build_sdk
     needs: prerequisites
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
@@ -280,7 +280,7 @@ jobs:
     permissions:
       contents: read
       id-token: write
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Checkout Repo
       uses: actions/checkout@v3
diff --git a/.github/workflows/upgrade-bridge.yml b/.github/workflows/upgrade-bridge.yml
index edb3b6606..2bef8e93b 100644
--- a/.github/workflows/upgrade-bridge.yml
+++ b/.github/workflows/upgrade-bridge.yml
@@ -49,7 +49,7 @@ env:
 jobs:
   upgrade_provider:
     name: upgrade-provider
-    runs-on: pulumi-ubuntu-8core
+    runs-on: ubuntu-latest
     steps:
     - name: Call upgrade provider action
       if: github.event_name == 'workflow_dispatch'
@@ -61,7 +61,6 @@ jobs:
         automerge: ${{ inputs.automerge }}
         target-bridge-version: ${{ inputs.target-bridge-version }}
         target-pulumi-version: ${{ inputs.target-pulumi-version }}
-        target-java-version: v0.9.3
         pr-reviewers: ${{ inputs.pr-reviewers }}
         pr-description: ${{ inputs.pr-description }}
     - name: Call upgrade provider action
diff --git a/.github/workflows/upgrade-provider.yml b/.github/workflows/upgrade-provider.yml
index a777a414f..505e20387 100644
--- a/.github/workflows/upgrade-provider.yml
+++ b/.github/workflows/upgrade-provider.yml
@@ -13,7 +13,6 @@ jobs:
       uses: pulumi/pulumi-upgrade-provider-action@v0.0.11
       with:
         kind: all
-        target-java-version: v0.9.3
         email: bot@pulumi.com
         username: pulumi-bot
     - env:
diff --git a/.upgrade-config.yml b/.upgrade-config.yml
index cb130d128..ecd3538df 100644
--- a/.upgrade-config.yml
+++ b/.upgrade-config.yml
@@ -6,4 +6,3 @@ upstream-provider-org: DataDog
 pulumi-infer-version: true
 remove-plugins: true
 pr-reviewers: iwahbe # Team: pulumi/Providers
-javaVersion: "v0.9.3"