refactor

Signed-off-by: Andrei Kvapil <[email protected]>
aenix-io · Oct 22, 2024 · 95897d6 · 95897d6
1 parent d640ef1
commit 95897d6
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
     hooks:
     - id: gen-versions-map
       name: Generate versions map and check for changes
-      entry: bash -c 'cd packages/apps && make check-version-map'
+      entry: sh -c 'make -C packages/apps check-version-map && make -C packages/extra check-version-map'
       language: system
       types: [file]
       pass_filenames: false

diff --git a/hack/values/tenant.yaml b/hack/values/tenant.yaml
@@ -1,6 +1,6 @@
 host: ""
 etcd: false
-monitoring: true
+monitoring: false
 ingress: false
-seaweedfs: true
+seaweedfs: false
 isolated: true
diff --git a/packages/core/testing/Makefile b/packages/core/testing/Makefile
@@ -36,9 +36,9 @@ image-e2e-sandbox:
 copy-hack-dir:
 	tar -C ../../../ -cf- hack | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- tar -xf-
 
-test: wait-for-sandbox ## Run the end-to-end tests in existing sandbox.
+test: wait-for-sandbox copy-hack-dir ## Run the end-to-end tests in existing sandbox.
 	helm template -n cozy-system installer ../installer | kubectl exec -i -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'cat > /cozystack-installer.yaml'
-	kubectl exec -ti -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'export COZYSTACK_INSTALLER_YAML=$$(cat /cozystack-installer.yaml) && /e2e.sh'
+	kubectl exec -ti -n $(NAMESPACE) deploy/cozystack-e2e-$(NAME) -- sh -c 'export COZYSTACK_INSTALLER_YAML=$$(cat /cozystack-installer.yaml) && /hack/e2e.sh'
 
 test-applications: wait-for-sandbox copy-hack-dir ## Run the end-to-end tests in existing sandbox for applications.
 	for app in $(TESTING_APPS); do \
@@ -47,8 +47,6 @@ test-applications: wait-for-sandbox copy-hack-dir ## Run the end-to-end tests in
 	done
 	kubectl exec -ti -n cozy-e2e-tests deploy/cozystack-e2e-sandbox -- bash -c "kubectl get hr -A | grep -v 'True'"
 
-test-result: wait-for-sandbox copy-hack-dir ## Run the end-to-end tests in existing sandbox for applications.
-
 delete: ## Remove sandbox from existing Kubernetes cluster.
 	kubectl delete deploy -n $(NAMESPACE) cozystack-e2e-$(NAME)
 

diff --git a/packages/core/testing/images/e2e-sandbox/Dockerfile b/packages/core/testing/images/e2e-sandbox/Dockerfile
@@ -5,7 +5,7 @@ ARG TALOSCTL_VERSION=1.7.6
 ARG HELM_VERSION=3.15.4
 
 RUN apt-get update
-RUN apt-get -y install genisoimage qemu-kvm qemu-utils iproute2 iptables wget xz-utils netcat curl
+RUN apt-get -y install genisoimage qemu-kvm qemu-utils iproute2 iptables wget xz-utils netcat curl jq
 RUN curl -LO "https://github.com/siderolabs/talos/releases/download/v${TALOSCTL_VERSION}/talosctl-linux-amd64" \
  && chmod +x talosctl-linux-amd64 \
  && mv talosctl-linux-amd64 /usr/local/bin/talosctl
@@ -14,4 +14,3 @@ RUN curl -LO "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kube
  && mv kubectl /usr/local/bin/kubectl
 RUN curl -sSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash -s - --version "v${HELM_VERSION}"
 RUN wget https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64 -O /usr/local/bin/yq && chmod +x /usr/local/bin/yq
-RUN apt-get install jq -y
diff --git a/packages/core/testing/values.yaml b/packages/core/testing/values.yaml
@@ -1,2 +1,2 @@
 e2e:
-  image: ghcr.io/aenix-io/cozystack/e2e-sandbox:v0.17.1@sha256:c3390f0076f4a8445273d0cdeda7725ac6f5110ad35e1a286be4b158708c4402
+  image: ghcr.io/aenix-io/cozystack/e2e-sandbox:latest@sha256:1a26a511b9e269bcb607e2d80f878d7c2d993b7a2a7a3a2a1042470c8c56b061