Merge pull request #618 from IBM/fix-smoketest-2

Merged after rebase and CI tests passing

Author: madhav165

.env.example

@@ -131,9 +131,12 @@ CORS_ENABLED=true
 #####################################
 
 RETRY_MAX_ATTEMPTS=3
-RETRY_BASE_DELAY=1.0  # seconds
-RETRY_MAX_DELAY=60.0  # seconds
-RETRY_JITTER_MAX=0.5  # fraction of delay
+# seconds
+RETRY_BASE_DELAY=1.0
+# seconds
+RETRY_MAX_DELAY=60.0
+# fraction of delay
+RETRY_JITTER_MAX=0.5
 
 #####################################
 # Logging
@@ -253,9 +256,8 @@ UNHEALTHY_THRESHOLD=3
 
 # This path is append with the system temp directory.
 # It is used to ensure that only one instance of the gateway health Check can run at a time.
-FILELOCK_NAME=gateway_healthcheck_init.lock   # saved dir in /tmp/gateway_healthcheck_init.lock
-# FILELOCK_NAME=somefolder/gateway_healthcheck_init.lock   # saved dir in /tmp/somefolder/gateway_healthcheck_init.lock#
-
+# saved dir in /tmp/gateway_healthcheck_init.lock
+FILELOCK_NAME=gateway_healthcheck_init.lock
 
 #####################################
 # Development Settings

Makefile

@@ -223,8 +223,10 @@ clean:
 ## --- Automated checks --------------------------------------------------------
 smoketest:
 	@echo "🚀 Running smoketest..."
-	@./smoketest.py --verbose || { echo "❌ Smoketest failed!"; exit 1; }
-	@echo "✅ Smoketest passed!"
+	@bash -c '\
+		./smoketest.py --verbose || { echo "❌ Smoketest failed!"; exit 1; }; \
+		echo "✅ Smoketest passed!" \
+	'
 
 test:
 	@echo "🧪 Running tests..."
@@ -1194,7 +1196,7 @@ endef
 
 # Containerfile to use (can be overridden)
 #CONTAINER_FILE ?= Containerfile
-CONTAINER_FILE ?= $(shell [ -f "Containerfile" ] && echo "Containerfile" || echo "Dockerfile")
+CONTAINER_FILE ?= $(shell [ -f "Containerfile.lite" ] && echo "Containerfile.lite" || echo "Dockerfile")
 
 
 # Define COMMA for the conditional Z flag
@@ -1267,6 +1269,7 @@ container-run-ssl: certs container-check-image
 	-$(CONTAINER_RUNTIME) stop $(PROJECT_NAME) 2>/dev/null || true
 	-$(CONTAINER_RUNTIME) rm $(PROJECT_NAME) 2>/dev/null || true
 	$(CONTAINER_RUNTIME) run --name $(PROJECT_NAME) \
+		-u $(id -u):$(id -g) \
 		--env-file=.env \
 		-e SSL=true \
 		-e CERT_FILE=certs/cert.pem \
@@ -1287,6 +1290,7 @@ container-run-ssl-host: certs container-check-image
 	-$(CONTAINER_RUNTIME) stop $(PROJECT_NAME) 2>/dev/null || true
 	-$(CONTAINER_RUNTIME) rm $(PROJECT_NAME) 2>/dev/null || true
 	$(CONTAINER_RUNTIME) run --name $(PROJECT_NAME) \
+		-u $(id -u):$(id -g) \
 		--network=host \
 		--env-file=.env \
 		-e SSL=true \

smoketest.py

@@ -59,7 +59,7 @@
     "-y",
     "supergateway",
     "--stdio",
-    "uvx mcp-server-time --local-timezone=Europe/Dublin",
+    "\"uvx mcp-server-time --local-timezone=Europe/Dublin\"",
     "--port",
     str(PORT_TIME_SERVER),
 ]
@@ -296,9 +296,17 @@ def step_4_docker_run():
 def step_5_start_time_server(restart=False):
     global _supergw_proc, _supergw_log_file
 
+    nvm_sh = os.path.expanduser("~/.nvm/nvm.sh")
+    cmd = f'source "{nvm_sh}" && nvm use default >/dev/null && npx --version'
+
     # Check if npx is available
     try:
-        npx_version = subprocess.check_output(["npx", "--version"], text=True, stderr=subprocess.DEVNULL).strip()
+        npx_version = subprocess.check_output(
+            ["bash", "-c", cmd],
+            text=True,
+            stderr=subprocess.DEVNULL
+        ).strip()
+
         logging.info("🔍 Found npx version: %s", npx_version)
     except (subprocess.CalledProcessError, FileNotFoundError):
         raise RuntimeError("npx not found. Please install Node.js and npm.")
@@ -337,8 +345,16 @@ def step_5_start_time_server(restart=False):
         logging.info("📝 Logging supergateway output to: %s", log_filename)
 
         # Start the process with output capture
+        cmd_str = " ".join(SUPERGW_CMD)
+        bash_cmd = f'''
+        export NVM_DIR="$HOME/.nvm"
+        source "{nvm_sh}"
+        nvm use default >/dev/null
+        exec {cmd_str}
+        '''
+
         _supergw_proc = subprocess.Popen(
-            SUPERGW_CMD,
+            ["bash", "-c", bash_cmd],
             stdout=_supergw_log_file,
             stderr=subprocess.STDOUT,
             text=True,
@@ -593,11 +609,13 @@ def main():
         logging.error("  - Check if port %d is already in use: lsof -i :%d", PORT_TIME_SERVER, PORT_TIME_SERVER)
         logging.error("  - Look for supergateway_*.log files for detailed output")
         logging.error("  - Try running with -v for verbose output")
-
-    if not failed:
-        cleanup()
-    else:
-        logging.warning("⚠️  Skipping cleanup due to failure. Run with --cleanup-only to clean up manually.")
+    finally:
+        if not failed:
+            cleanup()
+            sys.exit(0)
+        else:
+            logging.warning("⚠️  Skipping cleanup due to failure. Run with --cleanup-only to clean up manually.")
+            sys.exit(1)
 
 
 if __name__ == "__main__":