From 587638fbc8dc1ae66cb34c9bcfdc366daf25a298 Mon Sep 17 00:00:00 2001
From: Marius <24592972+gilbN@users.noreply.github.com>
Date: Thu, 9 May 2024 00:26:38 +0200
Subject: [PATCH] Set DOCKER_LOGS_TIMEOUT to 120 default. Remove deprecation
 warnings on unused envs.

---
 README.md       |  2 +-
 ci/ci.py        | 12 +++---------
 readme-vars.yml |  2 +-
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 1c4a979..a3ba3f6 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ sudo docker run --rm -i \
 -e SSL=<optional , use ssl for the screenshot true/false. Defaults to 'false'> \
 -e CI_S6_VERBOSITY=<optional, Updates the S6_VERBOSITY env. Defaults to '2'> \
 -e CI_LOG_LEVEL=<optional, Sets the ci logging level. Defaults to 'INFO'> \
--e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '900'> \
+-e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '120'> \
 -e DRY_RUN=<optional, Set to 'true' when you don't want to upload files to S3 when testing>
 -t lsiodev/ci:latest \
 python3 test_build.py
diff --git a/ci/ci.py b/ci/ci.py
index b7f9872..3b7d283 100755
--- a/ci/ci.py
+++ b/ci/ci.py
@@ -74,19 +74,15 @@ class SetEnvs():
         self.webauth: str = os.environ.get("WEB_AUTH", "user:password")
         self.webpath: str = os.environ.get("WEB_PATH", "")
         self.screenshot: bool = os.environ.get("WEB_SCREENSHOT", "false").lower() == "true"
-        self.screenshot_timeout: int = os.environ.get("WEB_SCREENSHOT_TIMEOUT", os.environ.get("WEB_SCREENSHOT_DELAY", "120"))
+        self.screenshot_timeout: int = os.environ.get("WEB_SCREENSHOT_TIMEOUT", "120")
         self.screenshot_delay: int = os.environ.get("SCREENSHOT_DELAY", "10")
-        self.logs_timeout: int = os.environ.get("DOCKER_LOGS_TIMEOUT", os.environ.get("DOCKER_LOGS_DELAY","900"))
+        self.logs_timeout: int = os.environ.get("DOCKER_LOGS_TIMEOUT", "120")
         self.sbom_timeout: int = os.environ.get("SBOM_TIMEOUT", "900")
         self.port: int = os.environ.get("PORT", "80")
         self.ssl: str = os.environ.get("SSL", "false")
         self.region: str = os.environ.get("S3_REGION", "us-east-1")
         self.bucket: str = os.environ.get("S3_BUCKET", "ci-tests.linuxserver.io")
-        
-        if os.environ.get("WEB_SCREENSHOT_DELAY"):
-            self.logger.warning("WEB_SCREENSHOT_DELAY env is deprecated, please use WEB_SCREENSHOT_TIMEOUT instead")
-        if os.environ.get("DOCKER_LOGS_DELAY"):
-            self.logger.warning("DOCKER_LOGS_DELAY env is deprecated, please use DOCKER_LOGS_TIMEOUT instead")
+
         if os.environ.get("DELAY_START"):
             self.logger.warning("DELAY_START env is obsolete, and not in use anymore")
         if os.environ.get("DOCKER_VOLUMES"):
@@ -113,10 +109,8 @@ class SetEnvs():
         WEB_PATH:               '{os.environ.get("WEB_PATH")}'
         WEB_SCREENSHOT:         '{os.environ.get("WEB_SCREENSHOT")}'
         WEB_SCREENSHOT_TIMEOUT: '{os.environ.get("WEB_SCREENSHOT_TIMEOUT")}'
-        WEB_SCREENSHOT_DELAY:   '{os.environ.get("WEB_SCREENSHOT_DELAY")}' (Deprecated)
         SCREENSHOT_DELAY:       '{os.environ.get("SCREENSHOT_DELAY")}'
         DOCKER_LOGS_TIMEOUT:    '{os.environ.get("DOCKER_LOGS_TIMEOUT")}'
-        DOCKER_LOGS_DELAY:      '{os.environ.get("DOCKER_LOGS_DELAY")}' (Deprecated)
         SBOM_TIMEOUT:           '{os.environ.get("SBOM_TIMEOUT")}'
         DELAY_START:            '{os.environ.get("DELAY_START")}' (Not in use)
         PORT:                   '{os.environ.get("PORT")}'
diff --git a/readme-vars.yml b/readme-vars.yml
index 4e72c5a..5dfa099 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -56,7 +56,7 @@ full_custom_readme: |
   -e SSL=<optional , use ssl for the screenshot true/false. Defaults to 'false'> \
   -e CI_S6_VERBOSITY=<optional, Updates the S6_VERBOSITY env. Defaults to '2'> \
   -e CI_LOG_LEVEL=<optional, Sets the ci logging level. Defaults to 'INFO'> \
-  -e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '900'> \
+  -e DOCKER_LOGS_TIMEOUT=<optional, How long to wait in seconds while tailing the container logs before timing out. Defaults to '120'> \
   -e DRY_RUN=<optional, Set to 'true' when you don't want to upload files to S3 when testing>
   -t lsiodev/ci:latest \
   python3 test_build.py