This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/spring-module-reorg in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 070fa8a32b8a2ff15d2485194df8bd0d7fbd0c8e Author: yasithdev <[email protected]> AuthorDate: Fri Mar 27 22:36:50 2026 -0500 refactor: update Tiltfile for unified server startup Replace 5 separate service definitions (airavata-server, research-service, agent-service, file-server, rest-proxy) with a single unified airavata-server entry. Update build deps to track new server modules. --- Tiltfile | 86 ++++++++++------------------------------------------------------ 1 file changed, 13 insertions(+), 73 deletions(-) diff --git a/Tiltfile b/Tiltfile index 7632a6a326..ad9700a596 100644 --- a/Tiltfile +++ b/Tiltfile @@ -13,91 +13,31 @@ local_resource( 'airavata-api/pom.xml', 'airavata-thrift-server/src', 'airavata-thrift-server/pom.xml', - 'modules/file-server/src', - 'modules/file-server/pom.xml', - 'modules/agent-framework/agent-service/src', - 'modules/agent-framework/agent-service/pom.xml', - 'modules/research-framework/research-service/src', - 'modules/research-framework/research-service/pom.xml', - 'modules/restproxy/src', - 'modules/restproxy/pom.xml', + 'airavata-rest-server/src', + 'airavata-rest-server/pom.xml', + 'airavata-grpc-server/src', + 'airavata-grpc-server/pom.xml', + 'airavata-server/src', + 'airavata-server/pom.xml', ], labels=['build'], ) -# --- Airavata Thrift Server (port 8930 thrift, 9097 monitoring) --- +# --- Airavata Server (unified: Thrift + REST + gRPC) --- local_resource( 'airavata-server', - serve_cmd=' '.join([ - 'java', - '-cp', 'airavata-thrift-server/target/classes:airavata-api/target/classes:airavata-api/target/dependency/*', - '-Dlog4j.configurationFile=airavata-api/src/main/resources/log4j2.xml', - '-Dairavata.config.dir=airavata-api/src/main/resources', - 'org.apache.airavata.api.server.AiravataServer', - ]), - readiness_probe=probe( - http_get=http_get_action(port=9097, path='/health/services'), - period_secs=5, - timeout_secs=5, - initial_delay_secs=15, - ), - resource_deps=['build', 'db', 'rabbitmq', 'zookeeper', 'kafka', 'keycloak'], - labels=['airavata'], -) - -# --- Research Service (port 18889 HTTP, 19908 gRPC) --- -local_resource( - 'research-service', - serve_cmd='mvn spring-boot:run -pl modules/research-framework/research-service -q', + serve_cmd='java -jar airavata-server/target/airavata-server-0.21-SNAPSHOT.jar', readiness_probe=probe( http_get=http_get_action(port=18889, path='/actuator/health'), - period_secs=5, - timeout_secs=5, - initial_delay_secs=20, - ), - resource_deps=['build', 'airavata-server', 'db', 'keycloak'], - labels=['airavata'], -) - -# --- Agent Service (port 18880 HTTP, 19900 gRPC) --- -local_resource( - 'agent-service', - serve_cmd='mvn spring-boot:run -pl modules/agent-framework/agent-service -q', - readiness_probe=probe( - http_get=http_get_action(port=18880, path='/actuator/health'), - period_secs=5, - timeout_secs=5, initial_delay_secs=20, - ), - resource_deps=['build', 'airavata-server', 'db'], - labels=['airavata'], -) - -# --- File Server (port 8050) --- -local_resource( - 'file-server', - serve_cmd='mvn spring-boot:run -pl modules/file-server -q', - readiness_probe=probe( - http_get=http_get_action(port=8050, path='/actuator/health'), - period_secs=5, - timeout_secs=5, - initial_delay_secs=15, - ), - resource_deps=['build', 'airavata-server'], - labels=['airavata'], -) - -# --- REST Proxy (port 8082) --- -local_resource( - 'rest-proxy', - serve_cmd='mvn spring-boot:run -pl modules/restproxy -q', - readiness_probe=probe( - http_get=http_get_action(port=8082, path='/actuator/health'), period_secs=5, timeout_secs=5, - initial_delay_secs=15, ), - resource_deps=['build', 'airavata-server', 'kafka'], + resource_deps=['build', 'db', 'rabbitmq', 'zookeeper', 'kafka', 'keycloak'], + links=[ + link('http://localhost:18889/swagger-ui.html', 'Swagger UI'), + link('http://localhost:18889/actuator/health', 'Health'), + ], labels=['airavata'], )
