From 3e877840a164c3ba0e5ca360230bbbf1734fa1fa Mon Sep 17 00:00:00 2001
From: Neal Richardson <neal.p.richardson@gmail.com>
Date: Wed, 19 Feb 2025 13:15:51 -0500
Subject: [PATCH] Remove IMAGE_OS setting (#637)

---
 .github/workflows/deploy_tests.yml     | 13 ++++++-------
 .github/workflows/main.yml             |  1 -
 integration-testing/docker-compose.yml |  1 -
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/deploy_tests.yml b/.github/workflows/deploy_tests.yml
index 3471b026..99f542d4 100644
--- a/.github/workflows/deploy_tests.yml
+++ b/.github/workflows/deploy_tests.yml
@@ -13,7 +13,7 @@ jobs:
             fetch-depth: 0
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            
+
         - uses: actions/setup-python@v4
           with:
             python-version: 3.8.x
@@ -44,7 +44,7 @@ jobs:
             fetch-depth: 0
           env:
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        
+
         - name: Delete unused stuff to save space
           run: sudo rm -rf /usr/share/dotnet /usr/local/lib/android
 
@@ -58,18 +58,18 @@ jobs:
                 examples
             sparse-checkout-cone-mode: false
             token: ${{ secrets.CONNECT_PAT }}
-    
+
         - name: Build docker container-image
           run: |
             cd test/connect-rsconnect-python/test/rsconnect-python/
             docker compose --profile rsconnect build
-    
+
         - name: Restore dist
           uses: actions/download-artifact@v4
           with:
             name: distributions
             path: dist/
-       
+
         - name: Run rsconnect-python Tests
           env:
             CONNECT_LICENSE: "${{ secrets.RSC_LICENSE }}"
@@ -81,7 +81,6 @@ jobs:
             QUARTO_VERSION: "1.4.546"
             # This allows us to start Connect separately in our own docker container
             CONNECT_SERVER: "http://localhost:3939"
-            IMAGE_OS: "rstudio/connect:ubuntu22"
             remote: "yes"
           run: |
             cd integration-testing
@@ -90,7 +89,7 @@ jobs:
             docker compose up -d connect-cli
             docker compose up -d client-cli
             docker compose run --rm client-cli just ../test/connect-rsconnect-python/test/rsconnect-python/_start-dev
-        
+
         # Videos are captured whether the suite fails or passes
         - name: Save videos
           uses: actions/upload-artifact@v4
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d2e9e4a2..7e38f3b6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -230,7 +230,6 @@ jobs:
 
               # This allows us to start Connect separately in our own docker container
               CONNECT_SERVER: "http://localhost:3939"
-              IMAGE_OS: "rstudio/connect:ubuntu22"
               remote: "yes"
             run: |
               cd integration-testing
diff --git a/integration-testing/docker-compose.yml b/integration-testing/docker-compose.yml
index 6cf6c5ac..9cfc285d 100644
--- a/integration-testing/docker-compose.yml
+++ b/integration-testing/docker-compose.yml
@@ -17,7 +17,6 @@ services:
       QUARTO_VERSION: ${QUARTO_VERSION}
       PY_VERSION: ${PY_VERSION}
       API_KEY: ${ADMIN_API_KEY}
-      IMAGE_OS: ${IMAGE_OS}
 
   # customized connect built with updated quarto version
   # used for nightly deploy_tests.yml that include quarto projects