Skip to content

Agent Mesh

fix e2e tests

Antonio Ojea002468e670c9
diff --git a/Makefile b/Makefile
index eaf13d44..4ed03ef0 100644
--- a/Makefile
+++ b/Makefile
@@ -72,6 +72,9 @@ docker-build-node:
docker-build-mock-oidc:
docker build -t sam-mock-oidc:local -f tests/e2e/docker/Dockerfile.mock-oidc .
-docker-build: docker-build-hub docker-build-node docker-build-mock-oidc
+docker-build-e2e-runtime:
+ docker build -t sam-e2e-runtime:local -f tests/e2e/docker/Dockerfile.sam-runtime .
-.PHONY: docker-build-hub docker-build-node docker-build-mock-oidc docker-build
+docker-build: docker-build-hub docker-build-node docker-build-mock-oidc docker-build-e2e-runtime
+
+.PHONY: docker-build-hub docker-build-node docker-build-mock-oidc docker-build-e2e-runtime docker-build
diff --git a/tests/e2e/auth_flows.bats b/tests/e2e/auth_flows.bats
index b6b4e063..b41bcdf4 100644
--- a/tests/e2e/auth_flows.bats
+++ b/tests/e2e/auth_flows.bats
@@ -46,7 +46,7 @@ teardown() {
[[ -n "${token}" ]]
- # 2. Run sam-node login and pipe the token
+ # 2. Run sam-node join to enroll and store identity
local node_name="${MESH_PREFIX}-node-login"
local hub_peer_id
hub_peer_id=$(cat "/tmp/${MESH_PREFIX}-hub-peer-id")
@@ -54,13 +54,11 @@ teardown() {
local data_vol="${MESH_PREFIX}-data"
docker volume create "${data_vol}"
- # We run it interactively to pipe stdin
- echo "${token}" | docker run --rm \
+ docker run --rm \
--network "${MESH_NETWORK}" \
-v "${data_vol}:/root/.config/sam-mesh" \
- -i \
"sam-node:local" \
- login --hub "http://sam-hub:9090" --oidc-issuer "http://mock-oidc:18080"
+ join "http://sam-hub:9090"
# Now run the node with the stored identity
docker run -d \
diff --git a/tests/e2e/lib/container_mesh.bash b/tests/e2e/lib/container_mesh.bash
index f359fcc6..132158df 100644
--- a/tests/e2e/lib/container_mesh.bash
+++ b/tests/e2e/lib/container_mesh.bash
@@ -38,10 +38,12 @@ if [[ -z "${MESH_HELPERS_LOADED:-}" ]]; then
}
mesh_build_runtime_image() {
- docker build --no-cache \
- -f tests/e2e/docker/Dockerfile.sam-runtime \
- -t "${MESH_RUNTIME_IMAGE}" \
- . >/dev/null
+ if ! docker image inspect "${MESH_RUNTIME_IMAGE}" >/dev/null 2>&1; then
+ docker build \
+ -f tests/e2e/docker/Dockerfile.sam-runtime \
+ -t "${MESH_RUNTIME_IMAGE}" \
+ . >/dev/null
+ fi
}
mesh_setup_env() {