bake in customizations to avoid duplicate installs

Author: BYK

.github/workflows/test.yml

@@ -212,6 +212,16 @@ jobs:
         run: |
           # This is for the cache restore on Kafka to work in older releases
           docker run --rm -v "sentry-kafka:/data" busybox chown -R 1000:1000 /data
+          # Add some customizations to test that path
+          cat <<EOT >> sentry/enhance-image.sh
+          #!/bin/bash
+          touch /created-by-enhance-image
+          apt-get update
+          apt-get install -y gcc libsasl2-dev python-dev-is-python3 libldap2-dev libssl-dev
+          EOT
+          chmod 755 sentry/enhance-image.sh
+          echo "python-ldap" > sentry/requirements.txt
+
           ./install.sh
 
       - name: Prepare Docker Volume Caching
@@ -242,7 +252,7 @@ jobs:
             /var/lib/docker/volumes/sentry-kafka \
             "$RUNNER_TEMP/volumes/"
           docker compose up --wait
-          pytest --cov --junitxml=junit.xml _integration-test/ --customizations=enabled
+          pytest --cov --junitxml=junit.xml _integration-test/
 
       - name: Inspect failure
         if: failure()

_integration-test/conftest.py

@@ -12,11 +12,6 @@
 TEST_PASS = "test123TEST"
 TIMEOUT_SECONDS = 60
 
-
-def pytest_addoption(parser):
-    parser.addoption("--customizations", default="disabled")
-
-
 @pytest.fixture(scope="session", autouse=True)
 def configure_self_hosted_environment(request):
     subprocess.run(
@@ -35,25 +30,6 @@ def configure_self_hosted_environment(request):
     else:
         raise AssertionError("timeout waiting for self-hosted to come up")
 
-    if request.config.getoption("--customizations") == "enabled":
-        os.environ["TEST_CUSTOMIZATIONS"] = "enabled"
-        script_content = """\
-#!/bin/bash
-touch /created-by-enhance-image
-apt-get update
-apt-get install -y gcc libsasl2-dev python-dev-is-python3 libldap2-dev libssl-dev
-"""
-
-        with open("sentry/enhance-image.sh", "w") as script_file:
-            script_file.write(script_content)
-        # Set executable permissions for the shell script
-        os.chmod("sentry/enhance-image.sh", 0o755)
-
-        # Write content to the requirements.txt file
-        with open("sentry/requirements.txt", "w") as req_file:
-            req_file.write("python-ldap\n")
-        os.environ["MINIMIZE_DOWNTIME"] = "1"
-        subprocess.run(["./install.sh"], check=True, capture_output=True)
     # Create test user
     subprocess.run(
         [

_integration-test/test_run.py

@@ -456,7 +456,4 @@ def test_customizations():
     ]
     for command in commands:
         result = subprocess.run(command, check=False)
-        if os.getenv("TEST_CUSTOMIZATIONS", "disabled") == "enabled":
-            assert result.returncode == 0
-        else:
-            assert result.returncode != 0
+        assert result.returncode == 0