Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ CONTROL_PLANE_IMAGE_REPO ?= host.docker.internal:5000/control-plane
TEST_RERUN_FAILS ?= 0
TEST_DISABLE_CACHE ?= 0
E2E_FIXTURE ?=
E2E_PARALLEL ?= 8
E2E_PARALLEL ?= 4
E2E_RUN ?=
E2E_SKIP_CLEANUP ?= 0
E2E_DEBUG ?= 0
Expand Down
6 changes: 5 additions & 1 deletion hack/dev-env.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ _use-test-config() {

_choose-scope() {
# (j:\n:) joins the array with newlines
local scope_choice=$(echo "host\ndatabase" | sk)
local scope_choice=$(echo "database\nhost" | sk)

if [[ -z "${scope_choice}" ]]; then
return 1
Expand Down Expand Up @@ -232,6 +232,7 @@ _psql-local() {

use-compose() {
export CP_ENV=compose
unset E2E_FIXTURE

_update-restish-config \
http://localhost:3000 \
Expand All @@ -244,6 +245,7 @@ use-compose() {

use-dev-lima() {
export CP_ENV=dev-lima
export E2E_FIXTURE=dev-lima

_update-restish-config \
http://localhost:3000 \
Expand All @@ -261,12 +263,14 @@ use-dev-lima() {

use-lima() {
export CP_ENV=lima
export E2E_FIXTURE=lima

_use-test-config
}

use-ec2() {
export CP_ENV=ec2
export E2E_FIXTURE=ec2

_use-test-config
}
Expand Down