This is an automated email from the ASF dual-hosted git repository. lahirujayathilake pushed a commit to branch cybershuttle-dev in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 36694d02b4ecb0ada23ac08b1e48b34cc8fb1146 Author: yasith <[email protected]> AuthorDate: Wed Feb 26 02:33:16 2025 -0600 refine Makefiles, move app-scripts to agent-framework/, fix bugs in agent.go and sample Dockerfile --- dev-tools/deployment/scripts/.gitkeep | 0 modules/agent-framework/airavata-agent/Makefile | 4 ++-- modules/agent-framework/airavata-agent/agent.go | 1 + modules/agent-framework/deployments/agent-cerebrum/Makefile | 2 +- modules/agent-framework/deployments/agent-cyberfaces/Makefile | 2 +- modules/agent-framework/deployments/agent-i-guide/Makefile | 2 +- modules/agent-framework/deployments/agent-md/Makefile | 2 +- modules/agent-framework/deployments/agent-sample/Dockerfile | 2 -- modules/agent-framework/deployments/agent-sample/Makefile | 2 +- .../agent.sh => deployments/app-scripts/anvil_agent.sh} | 0 .../agent-framework/deployments/app-scripts/expanse_af2.sh | 0 .../agent-framework/deployments/app-scripts/expanse_agent.sh | 0 .../agent-framework/deployments/app-scripts/expanse_namd.sh | 0 13 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dev-tools/deployment/scripts/.gitkeep b/dev-tools/deployment/scripts/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/modules/agent-framework/airavata-agent/Makefile b/modules/agent-framework/airavata-agent/Makefile index 09aea3e479..5d82463f7b 100644 --- a/modules/agent-framework/airavata-agent/Makefile +++ b/modules/agent-framework/airavata-agent/Makefile @@ -3,8 +3,8 @@ AGENT_SVC_URL=api.gateway.cybershuttle.org:19900 AGENT_ID=test build-container: - GOOS=linux GOARCH=amd64 go build -o airavata-agent; \ - docker build --platform linux/x86_64 -t $(IMAGE_NAME) .; \ + GOOS=linux GOARCH=amd64 go build -o airavata-agent && \ + docker build --platform linux/x86_64 -t $(IMAGE_NAME) . && \ docker push $(IMAGE_NAME) run-container: diff --git a/modules/agent-framework/airavata-agent/agent.go b/modules/agent-framework/airavata-agent/agent.go index 4c241aa2cb..8f49057db3 100644 --- a/modules/agent-framework/airavata-agent/agent.go +++ b/modules/agent-framework/airavata-agent/agent.go @@ -2,6 +2,7 @@ package main import ( protos "airavata-agent/protos" + "bufio" "bytes" "context" "encoding/json" diff --git a/modules/agent-framework/deployments/agent-cerebrum/Makefile b/modules/agent-framework/deployments/agent-cerebrum/Makefile index 7ada6e148e..cdb19da852 100644 --- a/modules/agent-framework/deployments/agent-cerebrum/Makefile +++ b/modules/agent-framework/deployments/agent-cerebrum/Makefile @@ -3,7 +3,7 @@ AGENT_SVC_URL=api.gateway.cybershuttle.org:19900 AGENT_ID=test build-container: - docker build --platform linux/x86_64 -t $(IMAGE_NAME) .; \ + docker build --platform linux/x86_64 -t $(IMAGE_NAME) . && \ docker push $(IMAGE_NAME) run-container: diff --git a/modules/agent-framework/deployments/agent-cyberfaces/Makefile b/modules/agent-framework/deployments/agent-cyberfaces/Makefile index f2ad904cea..b4c3ca700b 100644 --- a/modules/agent-framework/deployments/agent-cyberfaces/Makefile +++ b/modules/agent-framework/deployments/agent-cyberfaces/Makefile @@ -3,7 +3,7 @@ AGENT_SVC_URL=api.gateway.cybershuttle.org:19900 AGENT_ID=test build-container: - docker build --platform linux/x86_64 -t $(IMAGE_NAME) .; \ + docker build --platform linux/x86_64 -t $(IMAGE_NAME) . && \ docker push $(IMAGE_NAME) run-container: diff --git a/modules/agent-framework/deployments/agent-i-guide/Makefile b/modules/agent-framework/deployments/agent-i-guide/Makefile index 7d1c63c70d..0d2c640ba4 100644 --- a/modules/agent-framework/deployments/agent-i-guide/Makefile +++ b/modules/agent-framework/deployments/agent-i-guide/Makefile @@ -3,7 +3,7 @@ AGENT_SVC_URL=api.gateway.cybershuttle.org:19900 AGENT_ID=test build-container: - docker build --platform linux/x86_64 -t $(IMAGE_NAME) .; \ + docker build --platform linux/x86_64 -t $(IMAGE_NAME) . && \ docker push $(IMAGE_NAME) run-container: diff --git a/modules/agent-framework/deployments/agent-md/Makefile b/modules/agent-framework/deployments/agent-md/Makefile index 4aa557fe47..d1d6c1ec89 100644 --- a/modules/agent-framework/deployments/agent-md/Makefile +++ b/modules/agent-framework/deployments/agent-md/Makefile @@ -3,7 +3,7 @@ AGENT_SVC_URL=api.gateway.cybershuttle.org:19900 AGENT_ID=test build-container: - docker build --platform linux/x86_64 -t $(IMAGE_NAME) .; \ + docker build --platform linux/x86_64 -t $(IMAGE_NAME) . && \ docker push $(IMAGE_NAME) run-container: diff --git a/modules/agent-framework/deployments/agent-sample/Dockerfile b/modules/agent-framework/deployments/agent-sample/Dockerfile index 5161569349..44c72d04c8 100644 --- a/modules/agent-framework/deployments/agent-sample/Dockerfile +++ b/modules/agent-framework/deployments/agent-sample/Dockerfile @@ -7,5 +7,3 @@ RUN micromamba install -y -c conda-forge \ numpy \ pandas \ && micromamba clean --all -y - -COPY data /opt/data diff --git a/modules/agent-framework/deployments/agent-sample/Makefile b/modules/agent-framework/deployments/agent-sample/Makefile index 1465dbe776..cfd386a638 100644 --- a/modules/agent-framework/deployments/agent-sample/Makefile +++ b/modules/agent-framework/deployments/agent-sample/Makefile @@ -3,7 +3,7 @@ AGENT_SVC_URL=api.gateway.cybershuttle.org:19900 AGENT_ID=test build-container: - docker build --platform linux/x86_64 -t $(IMAGE_NAME) .; \ + docker build --platform linux/x86_64 -t $(IMAGE_NAME) . && \ docker push $(IMAGE_NAME) run-container: diff --git a/modules/agent-framework/airavata-agent/agent.sh b/modules/agent-framework/deployments/app-scripts/anvil_agent.sh similarity index 100% rename from modules/agent-framework/airavata-agent/agent.sh rename to modules/agent-framework/deployments/app-scripts/anvil_agent.sh diff --git a/dev-tools/deployment/scripts/expanse/alphafold2-agent.sh b/modules/agent-framework/deployments/app-scripts/expanse_af2.sh similarity index 100% rename from dev-tools/deployment/scripts/expanse/alphafold2-agent.sh rename to modules/agent-framework/deployments/app-scripts/expanse_af2.sh diff --git a/dev-tools/deployment/scripts/expanse/agent.sh b/modules/agent-framework/deployments/app-scripts/expanse_agent.sh similarity index 100% rename from dev-tools/deployment/scripts/expanse/agent.sh rename to modules/agent-framework/deployments/app-scripts/expanse_agent.sh diff --git a/dev-tools/deployment/scripts/expanse/namd-agent.sh b/modules/agent-framework/deployments/app-scripts/expanse_namd.sh similarity index 100% rename from dev-tools/deployment/scripts/expanse/namd-agent.sh rename to modules/agent-framework/deployments/app-scripts/expanse_namd.sh
