Skip to content

Commit

Permalink
test: simulate an upgrade in ci
Browse files Browse the repository at this point in the history
  • Loading branch information
shreddedbacon committed Feb 4, 2025
1 parent 42f9e0d commit 62b7b64
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 4 deletions.
4 changes: 3 additions & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,9 @@ pipeline {
steps {
sh script: "make local-dev-tools", label: "Configure k3d"
sh script: "./local-dev/k3d cluster delete --all", label: "Delete any remnant clusters"
sh script: "make k3d/test TESTS=[nginx] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Setup cluster and run nginx smoketest"
sh script: "make k3d/stable-local-stack INSTALL_SEED_DATA=false BRANCH_NAME=${SAFEBRANCH_NAME} LAGOON_CORE_USE_HTTPS=false", label: "Setup stable cluster"
sh script: "make k3d/retest TESTS=[nginx] BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Run nginx smoketest"
sh script: "make k3d/install-lagoon BRANCH_NAME=${SAFEBRANCH_NAME}", label: "Run lagoon upgrade"
sh script: "pkill -f './local-dev/stern'", label: "Closing off test-suite-0 log after test completion"
// script {
// skipRemainingStages = true
Expand Down
12 changes: 10 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -756,8 +756,12 @@ k3d/stable-install-lagoon:

# k3d/local-stack will deploy and seed a lagoon-core with a lagoon-remote and all basic services to get you going
# and will provide some initial seed data for a user to jump right in and start using lagoon
INSTALL_SEED_DATA = true
.PHONY: k3d/local-stack
k3d/local-stack: k3d/setup k3d/install-lagoon k3d/seed-data k3d/get-lagoon-details
k3d/local-stack: k3d/setup k3d/install-lagoon
ifeq ($(INSTALL_SEED_DATA),true)
k3d/local-stack: k3d/seed-data k3d/get-lagoon-details
endif

# k3d/stable-local-stack is the same as k3d/local-stack except that it starts it with the latest stable chart versions
# a helper without having to remember to specify the stable option to the target
Expand Down Expand Up @@ -876,6 +880,8 @@ endif
echo "Loading API seed data" && \
export SSH_PORTAL_HOST="$$($(KUBECTL) -n lagoon get services lagoon-remote-ssh-portal -o jsonpath='{.status.loadBalancer.ingress[0].ip}')" && \
export SSH_PORTAL_PORT="$$($(KUBECTL) -n lagoon get services lagoon-remote-ssh-portal -o jsonpath='{.spec.ports[0].port}')" && \
export TOKEN="$$($(KUBECTL) -n lagoon get secret lagoon-remote-ssh-core-token -o json | $(JQ) -r '.data.token | @base64d')" && \
export CONSOLE_URL="https://kubernetes.default.svc/" && \
export ROUTER_PATTERN="\$${project}.\$${environment}.$$($(KUBECTL) -n ingress-nginx get services ingress-nginx-controller -o jsonpath='{.status.loadBalancer.ingress[0].ip}')" && \
export SEED_DATA=$$(if [ $(INSTALL_STABLE_CORE) = true ]; then \
envsubst < <(curl -s https://raw.githubusercontent.com/uselagoon/lagoon/refs/tags/$(STABLE_CORE_CHART_APP_VERSION)/local-dev/k3d-seed-data/00-populate-kubernetes.gql) | sed 's/"/\\"/g' | sed 's/\\n/\\\\n/g' | awk -F'\n' '{if(NR == 1) {printf $$0} else {printf "\\n"$$0}}'; \
Expand Down Expand Up @@ -927,8 +933,10 @@ k3d/port-forwards:
.PHONY: k3d/retest
k3d/retest:
export KUBECONFIG="$$(pwd)/kubeconfig.k3d.$(CI_BUILD_TAG)" \
&& $(MAKE) build/local-git \
&& $(MAKE) build/local-api-data-watcher-pusher \
&& $(MAKE) build/tests \
&& $(MAKE) k3d/push-images JQ=$(JQ) HELM=$(HELM) KUBECTL=$(KUBECTL) IMAGES="tests" \
&& $(MAKE) k3d/push-images JQ=$(JQ) HELM=$(HELM) KUBECTL=$(KUBECTL) IMAGES="tests local-git local-api-data-watcher-pusher" \
&& cd lagoon-charts.k3d.lagoon \
&& export IMAGE_REGISTRY="registry.$$($(KUBECTL) -n ingress-nginx get services ingress-nginx-controller -o jsonpath='{.status.loadBalancer.ingress[0].ip}').nip.io/library" \
&& $(MAKE) fill-test-ci-values DOCKER_NETWORK=$(DOCKER_NETWORK) TESTS=$(TESTS) IMAGE_TAG=$(SAFE_BRANCH_NAME) DISABLE_CORE_HARBOR=true \
Expand Down
2 changes: 1 addition & 1 deletion local-dev/k3d-seed-data/00-populate-kubernetes.gql
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mutation PopulateApi {
input: {
id: 2001
name: "ci-local-control-k8s"
consoleUrl: "https://localhost:8443/"
consoleUrl: "${CONSOLE_URL}"
routerPattern: "${ROUTER_PATTERN}.nip.io"
sshHost: "${SSH_PORTAL_HOST}"
sshPort: "${SSH_PORTAL_PORT}"
Expand Down

0 comments on commit 62b7b64

Please sign in to comment.