Skip to content

Commit

Permalink
chore: temporarily override charts_treeish and lagoon-build-deploy image
Browse files Browse the repository at this point in the history
These overrides are required to control feature flags in CI.
  • Loading branch information
smlx committed Apr 1, 2021
1 parent 1c6f66d commit 83be81f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ KIND_VERSION = v0.10.0
GOJQ_VERSION = v0.11.2
KIND_IMAGE = kindest/node:v1.20.2@sha256:8f7ea6e7642c0da54f04a7ee10431549c0257315b3a634f6ef2fecaaedb19bab
TESTS = [api,features-kubernetes,nginx,drupal-php73,drupal-php74,drupal-postgres,python,gitlab,github,bitbucket,node-mongodb,elasticsearch]
CHARTS_TREEISH = main
CHARTS_TREEISH = feature-flags

local-dev/kind:
ifeq ($(KIND_VERSION), $(shell kind version 2>/dev/null | sed -nE 's/kind (v[0-9.]+).*/\1/p'))
Expand Down Expand Up @@ -1051,6 +1051,8 @@ kind/test: kind/cluster helm/repos $(addprefix local-dev/,$(KIND_TOOLS)) $(addpr
HELM=$$(realpath ../local-dev/helm) KUBECTL=$$(realpath ../local-dev/kubectl) \
JQ=$$(realpath ../local-dev/jq) \
OVERRIDE_BUILD_DEPLOY_DIND_IMAGE=$$IMAGE_REGISTRY/kubectl-build-deploy-dind:$(SAFE_BRANCH_NAME) \
OVERRIDE_BUILD_DEPLOY_CONTROLLER_IMAGE_REPOSITORY=smlx/lagoon-builddeploy \
OVERRIDE_BUILD_DEPLOY_CONTROLLER_IMAGETAG=feature-flags \
IMAGE_REGISTRY=$$IMAGE_REGISTRY \
&& sleep 30 \
&& docker run --rm --network host --name ct-$(CI_BUILD_TAG) \
Expand Down

0 comments on commit 83be81f

Please sign in to comment.