Skip to content

Commit 1332fe2

Browse files
committed
fix: harness
1 parent bea0c50 commit 1332fe2

File tree

3 files changed

+5
-32
lines changed

3 files changed

+5
-32
lines changed

Dockerfile.test

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG BASE_IMAGE
22
FROM $BASE_IMAGE
33
ENV GEM_HOME=/var/runtime
4+
ADD test/dockerized/tasks /var/task
45
RUN gem uninstall aws_lambda_ric --executables
56
ADD pkg /tmp/pkg
67
RUN gem install /tmp/pkg/aws_lambda_ric-*.gem

Dockerfile.test-runner

Lines changed: 0 additions & 28 deletions
This file was deleted.

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ test-dockerized:
4444
docker build . -t local/test -f Dockerfile.test --build-arg BASE_IMAGE=public.ecr.aws/lambda/ruby:$(RUBY_VERSION)
4545
@echo "Setting up containerized test runner..."
4646
@if [ ! -d ".test-runner" ]; then \
47-
echo "Cloning containerized-test-runner-for-aws-lambda..."; \
48-
git clone --quiet git@github.com:aws/containerized-test-runner-for-aws-lambda.git .test-runner; \
47+
echo "Copying local containerized-test-runner-for-aws-lambda..."; \
48+
cp -r ../containerized-test-runner-for-aws-lambda .test-runner; \
4949
fi
5050
@echo "Building test runner Docker image..."
51-
@docker build -t test-runner:local -f Dockerfile.test-runner .
51+
@docker build -t test-runner:local -f .test-runner/Dockerfile .test-runner
5252
@echo "Running tests in Docker..."
5353
@docker run --rm \
54+
--entrypoint suite \
5455
-e DOCKER_API_VERSION=1.41 \
5556
-v /var/run/docker.sock:/var/run/docker.sock \
5657
-v $(CURDIR)/test/dockerized/tasks:$(CURDIR)/test/dockerized/tasks:ro \
5758
-v $(CURDIR)/test/dockerized/suites:/suites:ro \
5859
test-runner:local \
5960
--test-image local/test \
6061
--debug \
61-
--task-root $(CURDIR)/test/dockerized/tasks \
6262
/suites/*.json
6363

6464
.PHONY: pr

0 commit comments

Comments
 (0)