From d2c825a35d60d033b6d996680f6182832ab44496 Mon Sep 17 00:00:00 2001 From: David Boreham Date: Mon, 29 Apr 2024 17:05:44 -0600 Subject: [PATCH 1/2] Move stack directories under common parent --- .../compose}/docker-compose-go-nitro-auth.yml | 0 .../compose}/docker-compose-nitro-auth.yml | 0 .../compose}/docker-compose-nitro-contracts.yml | 0 {config => stack-orchestrator/config}/go-nitro-auth/alice.env | 0 {config => stack-orchestrator/config}/go-nitro-auth/bob.env | 0 {config => stack-orchestrator/config}/go-nitro-auth/bootnode.env | 0 .../config}/go-nitro-auth/caddy/Caddyfile | 0 {config => stack-orchestrator/config}/go-nitro/run-nitro-node.sh | 0 {config => stack-orchestrator/config}/nitro-auth/alice.env | 0 {config => stack-orchestrator/config}/nitro-auth/bob.env | 0 {config => stack-orchestrator/config}/nitro-auth/bootnode.env | 0 {config => stack-orchestrator/config}/nitro-auth/caddy/Caddyfile | 0 {config => stack-orchestrator/config}/nitro-auth/charlie.env | 0 {config => stack-orchestrator/config}/nitro-contracts/deploy.sh | 0 .../container-build}/cerc-go-nitro/Dockerfile | 0 .../container-build}/cerc-go-nitro/build.sh | 0 .../container-build}/cerc-nitro-contracts/Dockerfile | 0 .../container-build}/cerc-nitro-contracts/build.sh | 0 .../container-build}/cerc-nitro-rpc-client/Dockerfile | 0 .../container-build}/cerc-nitro-rpc-client/build.sh | 0 {stacks => stack-orchestrator/stacks}/din-payments/README.md | 0 {stacks => stack-orchestrator/stacks}/din-payments/stack.yml | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename {compose => stack-orchestrator/compose}/docker-compose-go-nitro-auth.yml (100%) rename {compose => stack-orchestrator/compose}/docker-compose-nitro-auth.yml (100%) rename {compose => stack-orchestrator/compose}/docker-compose-nitro-contracts.yml (100%) rename {config => stack-orchestrator/config}/go-nitro-auth/alice.env (100%) rename {config => stack-orchestrator/config}/go-nitro-auth/bob.env (100%) rename {config => stack-orchestrator/config}/go-nitro-auth/bootnode.env (100%) rename {config => stack-orchestrator/config}/go-nitro-auth/caddy/Caddyfile (100%) rename {config => stack-orchestrator/config}/go-nitro/run-nitro-node.sh (100%) rename {config => stack-orchestrator/config}/nitro-auth/alice.env (100%) rename {config => stack-orchestrator/config}/nitro-auth/bob.env (100%) rename {config => stack-orchestrator/config}/nitro-auth/bootnode.env (100%) rename {config => stack-orchestrator/config}/nitro-auth/caddy/Caddyfile (100%) rename {config => stack-orchestrator/config}/nitro-auth/charlie.env (100%) rename {config => stack-orchestrator/config}/nitro-contracts/deploy.sh (100%) rename {container-build => stack-orchestrator/container-build}/cerc-go-nitro/Dockerfile (100%) rename {container-build => stack-orchestrator/container-build}/cerc-go-nitro/build.sh (100%) rename {container-build => stack-orchestrator/container-build}/cerc-nitro-contracts/Dockerfile (100%) rename {container-build => stack-orchestrator/container-build}/cerc-nitro-contracts/build.sh (100%) rename {container-build => stack-orchestrator/container-build}/cerc-nitro-rpc-client/Dockerfile (100%) rename {container-build => stack-orchestrator/container-build}/cerc-nitro-rpc-client/build.sh (100%) rename {stacks => stack-orchestrator/stacks}/din-payments/README.md (100%) rename {stacks => stack-orchestrator/stacks}/din-payments/stack.yml (100%) diff --git a/compose/docker-compose-go-nitro-auth.yml b/stack-orchestrator/compose/docker-compose-go-nitro-auth.yml similarity index 100% rename from compose/docker-compose-go-nitro-auth.yml rename to stack-orchestrator/compose/docker-compose-go-nitro-auth.yml diff --git a/compose/docker-compose-nitro-auth.yml b/stack-orchestrator/compose/docker-compose-nitro-auth.yml similarity index 100% rename from compose/docker-compose-nitro-auth.yml rename to stack-orchestrator/compose/docker-compose-nitro-auth.yml diff --git a/compose/docker-compose-nitro-contracts.yml b/stack-orchestrator/compose/docker-compose-nitro-contracts.yml similarity index 100% rename from compose/docker-compose-nitro-contracts.yml rename to stack-orchestrator/compose/docker-compose-nitro-contracts.yml diff --git a/config/go-nitro-auth/alice.env b/stack-orchestrator/config/go-nitro-auth/alice.env similarity index 100% rename from config/go-nitro-auth/alice.env rename to stack-orchestrator/config/go-nitro-auth/alice.env diff --git a/config/go-nitro-auth/bob.env b/stack-orchestrator/config/go-nitro-auth/bob.env similarity index 100% rename from config/go-nitro-auth/bob.env rename to stack-orchestrator/config/go-nitro-auth/bob.env diff --git a/config/go-nitro-auth/bootnode.env b/stack-orchestrator/config/go-nitro-auth/bootnode.env similarity index 100% rename from config/go-nitro-auth/bootnode.env rename to stack-orchestrator/config/go-nitro-auth/bootnode.env diff --git a/config/go-nitro-auth/caddy/Caddyfile b/stack-orchestrator/config/go-nitro-auth/caddy/Caddyfile similarity index 100% rename from config/go-nitro-auth/caddy/Caddyfile rename to stack-orchestrator/config/go-nitro-auth/caddy/Caddyfile diff --git a/config/go-nitro/run-nitro-node.sh b/stack-orchestrator/config/go-nitro/run-nitro-node.sh similarity index 100% rename from config/go-nitro/run-nitro-node.sh rename to stack-orchestrator/config/go-nitro/run-nitro-node.sh diff --git a/config/nitro-auth/alice.env b/stack-orchestrator/config/nitro-auth/alice.env similarity index 100% rename from config/nitro-auth/alice.env rename to stack-orchestrator/config/nitro-auth/alice.env diff --git a/config/nitro-auth/bob.env b/stack-orchestrator/config/nitro-auth/bob.env similarity index 100% rename from config/nitro-auth/bob.env rename to stack-orchestrator/config/nitro-auth/bob.env diff --git a/config/nitro-auth/bootnode.env b/stack-orchestrator/config/nitro-auth/bootnode.env similarity index 100% rename from config/nitro-auth/bootnode.env rename to stack-orchestrator/config/nitro-auth/bootnode.env diff --git a/config/nitro-auth/caddy/Caddyfile b/stack-orchestrator/config/nitro-auth/caddy/Caddyfile similarity index 100% rename from config/nitro-auth/caddy/Caddyfile rename to stack-orchestrator/config/nitro-auth/caddy/Caddyfile diff --git a/config/nitro-auth/charlie.env b/stack-orchestrator/config/nitro-auth/charlie.env similarity index 100% rename from config/nitro-auth/charlie.env rename to stack-orchestrator/config/nitro-auth/charlie.env diff --git a/config/nitro-contracts/deploy.sh b/stack-orchestrator/config/nitro-contracts/deploy.sh similarity index 100% rename from config/nitro-contracts/deploy.sh rename to stack-orchestrator/config/nitro-contracts/deploy.sh diff --git a/container-build/cerc-go-nitro/Dockerfile b/stack-orchestrator/container-build/cerc-go-nitro/Dockerfile similarity index 100% rename from container-build/cerc-go-nitro/Dockerfile rename to stack-orchestrator/container-build/cerc-go-nitro/Dockerfile diff --git a/container-build/cerc-go-nitro/build.sh b/stack-orchestrator/container-build/cerc-go-nitro/build.sh similarity index 100% rename from container-build/cerc-go-nitro/build.sh rename to stack-orchestrator/container-build/cerc-go-nitro/build.sh diff --git a/container-build/cerc-nitro-contracts/Dockerfile b/stack-orchestrator/container-build/cerc-nitro-contracts/Dockerfile similarity index 100% rename from container-build/cerc-nitro-contracts/Dockerfile rename to stack-orchestrator/container-build/cerc-nitro-contracts/Dockerfile diff --git a/container-build/cerc-nitro-contracts/build.sh b/stack-orchestrator/container-build/cerc-nitro-contracts/build.sh similarity index 100% rename from container-build/cerc-nitro-contracts/build.sh rename to stack-orchestrator/container-build/cerc-nitro-contracts/build.sh diff --git a/container-build/cerc-nitro-rpc-client/Dockerfile b/stack-orchestrator/container-build/cerc-nitro-rpc-client/Dockerfile similarity index 100% rename from container-build/cerc-nitro-rpc-client/Dockerfile rename to stack-orchestrator/container-build/cerc-nitro-rpc-client/Dockerfile diff --git a/container-build/cerc-nitro-rpc-client/build.sh b/stack-orchestrator/container-build/cerc-nitro-rpc-client/build.sh similarity index 100% rename from container-build/cerc-nitro-rpc-client/build.sh rename to stack-orchestrator/container-build/cerc-nitro-rpc-client/build.sh diff --git a/stacks/din-payments/README.md b/stack-orchestrator/stacks/din-payments/README.md similarity index 100% rename from stacks/din-payments/README.md rename to stack-orchestrator/stacks/din-payments/README.md diff --git a/stacks/din-payments/stack.yml b/stack-orchestrator/stacks/din-payments/stack.yml similarity index 100% rename from stacks/din-payments/stack.yml rename to stack-orchestrator/stacks/din-payments/stack.yml From 2659b42cf59731985f0aac3231a9d08ce998774b Mon Sep 17 00:00:00 2001 From: David Boreham Date: Mon, 29 Apr 2024 17:07:17 -0600 Subject: [PATCH 2/2] Modify test script for new directory layout --- tests/din-payments-stack/run-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/din-payments-stack/run-test.sh b/tests/din-payments-stack/run-test.sh index 347b6c3..187b042 100755 --- a/tests/din-payments-stack/run-test.sh +++ b/tests/din-payments-stack/run-test.sh @@ -9,7 +9,7 @@ SO_COMMAND=laconic-so test_name="DIN payments stack deploy test" echo "Running ${test_name}" -stack_name=$(pwd)/stacks/din-payments +stack_name=$(pwd)/stack-orchestrator/stacks/din-payments test_fail_exit () { local fail_message=$1