Dockerize testbed runner

Signed-off-by: Andrew Richardson <[email protected]>
LF-Decentralized-Trust-labs · Aug 15, 2024 · 2f0f624 · 2f0f624
1 parent e5862a0
commit 2f0f624
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 23 deletions.
diff --git a/domains/noto/build.gradle b/domains/noto/build.gradle
@@ -14,8 +14,6 @@
  */
 
 ext {
-    testProcess = null
-
     goFiles = fileTree(".") {
         include "internal/**/*.go"
     }
@@ -44,19 +42,18 @@ task copySolidity(type: Copy) {
     includeEmptyDirs = false
 }
 
-task startTestbed {
-    doFirst {
-        project.ext.testProcess = new ProcessBuilder()
-            .directory(project(':kata').projectDir)
-            .command("go", "run", "./testbed", "${projectDir}/testbed.config.yaml")
-            .start()
-    }
+task startTestbed(type: DockerCompose) {
+    composeFile '../../testinfra/docker-compose-test.yml'
+    composeFile 'docker-compose-test.yml'
+    args '-p', 'paladin-noto'
+    args 'up', '-d', '--build'
 }
 
-task stopTestbed {
-    doFirst {
-        project.ext.testProcess.destroy()
-    }
+task stopTestbed(type: DockerCompose) {
+    composeFile '../../testinfra/docker-compose-test.yml'
+    composeFile 'docker-compose-test.yml'
+    args '-p', 'paladin-noto'
+    args 'down'
 }
 
 task test(type: Exec) {
@@ -75,7 +72,22 @@ task test(type: Exec) {
 
     dependsOn copySolidity
     dependsOn startTestbed
-    finalizedBy stopTestbed
+
+    ignoreExitValue true
+
+    doLast {
+        ExecResult execResult = executionResult.get()
+        if (execResult.exitValue != 0) {
+            startTestbed.dumpLogs("testbed")
+        }
+        execResult.assertNormalExitValue()
+    }
+}
+
+task build {
+    dependsOn test
 }
 
-task build(dependsOn: test) {}
+task clean {
+    dependsOn stopTestbed
+}
diff --git a/domains/noto/docker-compose-test.yml b/domains/noto/docker-compose-test.yml
@@ -0,0 +1,24 @@
+# Extensions to ../testinfra/docker-compose-test.yml
+services:
+  postgres:
+    ports: !reset []
+    expose:
+      - 5432
+  besu:
+    ports: !reset []
+    expose:
+      - 8545
+      - 8546
+  testbed:
+    build:
+      context: ../kata
+      dockerfile: testbed/Dockerfile
+    command: testbed.config.yaml
+    depends_on:
+      besu:
+        condition: service_healthy
+    volumes:
+      - ../domains/noto/testbed.config.yaml:/usr/src/app/testbed.config.yaml
+    ports:
+      - 49600:49600
+      - 49601:49601
diff --git a/domains/noto/internal/noto/e2e_noto_test.go b/domains/noto/internal/noto/e2e_noto_test.go
@@ -29,8 +29,8 @@ import (
 // TODO: fix things that should not be hard-coded
 var (
 	toDomain    = "to-domain"
-	testbedAddr = "http://127.0.0.1:49603"
-	grpcAddr    = "unix:/tmp/testbed.paladin.1542386773.sock"
+	testbedAddr = "http://127.0.0.1:49600"
+	grpcAddr    = "dns:localhost:49601"
 	account1    = "0x9180ff8fa5c502b9bfe5dfeaf477e157dbfaba5c"
 )
 

diff --git a/domains/noto/testbed.config.yaml b/domains/noto/testbed.config.yaml
@@ -6,16 +6,18 @@ db:
     migrationsDir: './db/migrations/sqlite'
 rpcServer:
   http:
-    port: 49603
+    address: 0.0.0.0
+    port: 49600
   ws:
     disabled: true
 blockchain:
   ws:
-    url: ws://localhost:8546
+    url: ws://besu:8546
     initialConnectAttempts: 25
 bus:
   grpc:
-    socketAddress: /tmp/testbed.paladin.1542386773.sock
+    socketProtocol: tcp
+    socketAddress: ":49601"
 signer:
   keyDerivation:
     type: "bip32"

diff --git a/kata/testbed/Dockerfile b/kata/testbed/Dockerfile
@@ -0,0 +1,11 @@
+FROM golang:1.22
+
+WORKDIR /usr/src/app
+
+ENV CGO_ENABLED 1
+
+COPY go.mod go.sum /usr/src/app/
+COPY . /usr/src/app
+RUN go build -o /usr/local/bin/testbed ./testbed
+
+ENTRYPOINT [ "/usr/local/bin/testbed" ]
diff --git a/testinfra/build.gradle b/testinfra/build.gradle
@@ -23,11 +23,13 @@ task besuBootstrapTool(type: Exec) {
 
 task startTestInfra(type: DockerCompose, dependsOn: tasks.besuBootstrapTool) {
     composeFile 'docker-compose-test.yml'
+    args '-p', 'paladin-testinfra'
     args 'up', '-d'
 }
 
 task stopTestInfra(type: DockerCompose) {
     composeFile 'docker-compose-test.yml'
+    args '-p', 'paladin-testinfra'
     args 'down'
 }
 

diff --git a/testinfra/docker-compose-test.yml b/testinfra/docker-compose-test.yml
@@ -1,22 +1,19 @@
 services:
   postgres:
-    container_name: paladin-test-db
     image: postgres
     ports:
       - 5432:5432
     environment:
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: my-secret
   besu_bootstrap:
-    container_name: paladin-besu-bootstrap
     image: paladin/besu_bootstrap
     user: 0:0
     volumes:
       - besu_data:/var/besu:rw
     command:
       - /var/besu
   besu:
-    container_name: paladin-test-besu
     image: hyperledger/besu:latest
     user: 0:0
     volumes:
@@ -46,6 +43,7 @@ services:
       - --data-path=/var/besu/data
       - --node-private-key-file=/var/besu/key
       - --revert-reason-enabled
+      - --host-allowlist=localhost,besu
 volumes:
   besu_data:
     driver: local