diff --git a/Makefile b/Makefile index b564b597..fab7a72d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ git_commit = $(shell git log -1 --pretty=format:"%H") test_unit: - go test -v -race ./pkg/config/resources/container + go test -v -race ./... test_functional: go run main.go purge @@ -21,6 +21,21 @@ test_functional: go run main.go purge go run main.go test ./examples/multiple_k3s_clusters + + go run main.go purge + go run main.go test ./examples/local_exec + + go run main.go purge + go run main.go test ./examples/remote_exec + + go run main.go purge + go run main.go test ./examples/certificates + + go run main.go purge + go run main.go test ./examples/terraform + + go run main.go purge + go run main.go test ./examples/registiries test_e2e_cmd: install_local jumppad up --no-browser ./examples/single_k3s_cluster diff --git a/examples/container/container.hcl b/examples/container/container.hcl index c4bdeec7..6f26ac75 100644 --- a/examples/container/container.hcl +++ b/examples/container/container.hcl @@ -7,7 +7,6 @@ variable "envoy_version" { } resource "template" "consul_config" { - source = <<-EOF data_dir = "{{ data_dir }}" log_level = "DEBUG" diff --git a/examples/container/test/container.feature b/examples/container/test/container.feature index 22728e5d..0e56f0ac 100644 --- a/examples/container/test/container.feature +++ b/examples/container/test/container.feature @@ -3,7 +3,7 @@ Feature: Docker Container I should apply a blueprint which defines a simple container setup and test the resources are created correctly -Scenario: Single Container from Local Blueprint +Scenario: Docker Containers from Local Blueprint Given I have a running blueprint Then the following resources should be running | name | @@ -17,7 +17,7 @@ Scenario: Single Container from Local Blueprint And the info "{.NetworkSettings.Ports['8500/tcp'][0].HostPort}" for the running container "resource.container.consul" should contain "85" And a HTTP call to "http://consul.container.shipyard.run:8500/v1/status/leader" should result in status 200 -Scenario: Single Container from Local Blueprint with multiple runs +Scenario: Docker Containers from Local Blueprint with multiple runs Given the environment variable "CONSUL_VERSION" has a value "" And the environment variable "ENVOY_VERSION" has a value "" And I have a running blueprint