Saving

linode · Apr 23, 2024 · 015839f · 015839f
1 parent 9c0897b
commit 015839f
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 19 deletions.
diff --git a/.github/workflows/build_test_ci.yml b/.github/workflows/build_test_ci.yml
@@ -172,8 +172,9 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.github_token }}
         LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}
 
-    - name: Partial E2E Test
-      run: make e2etest-pr
+    - name: Quick E2E Test
+      if: github.ref != 'refs/heads/main'
+      run: make e2etest-quick
       env:
         GITHUB_TOKEN: ${{ secrets.github_token }}
         LINODE_TOKEN: ${{ secrets.LINODE_TOKEN }}

diff --git a/Makefile b/Makefile
@@ -147,11 +147,11 @@ test: generate fmt vet envtest ## Run tests.
 
 .PHONY: e2etest
 e2etest: generate local-deploy chainsaw
-	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e --assert-timeout 600s
+	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e/default-capl-cluster --assert-timeout 600s --cluster child-cluster=/e2e/default-capl-cluster/child-cluster-kubeconfig.yaml
 
 .PHONY: e2etest-pr
-e2etest-pr: generate local-deploy chainsaw
-	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e --selector on-pr
+e2etest-quick: generate local-deploy chainsaw
+	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e --selector quick
 
 local-deploy: kind ctlptl tilt kustomize clusterctl
 	@echo -n "LINODE_TOKEN=$(LINODE_TOKEN)" > config/default/.env.linode

diff --git a/e2e/default-CAPL-cluster/04-cleanup-cluster.yaml b/e2e/default-CAPL-cluster/04-cleanup-cluster.yaml
diff --git a/e2e/default-CAPL-cluster/chainsaw-test.yaml b/e2e/default-CAPL-cluster/chainsaw-test.yaml
@@ -47,6 +47,19 @@ spec:
           ($error): ~
           (json_parse($stdout)):
             results: 2
+  - name: step-02b - get child cluster kubeconfig
+    try:
+    - script:
+        content: |
+          clusterctl get kubeconfig ($cluster) > child-cluster-kubeconfig.yaml
+        check:
+          ($error == null): true
+  # - name: step-02c - check child cluster
+  #   try:
+  #   - script:
+  #       cluster: child-cluster
+  #       content: |
+  #         kubectl get nodes -o wide
   - name: step-03
     try:
     - delete:
@@ -79,7 +92,3 @@ spec:
           ($error): ~
           (json_parse($stdout)):
             results: 0
-  - name: step-05
-    try:
-    - apply:
-        file: 04-cleanup-cluster.yaml
diff --git a/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml b/e2e/linodecluster-controller/minimal-linodecluster/chainsaw-test.yaml
@@ -6,7 +6,7 @@ metadata:
   name: minimal-linodecluster
   # Label to trigger the test on every PR
   labels:
-    on-pr:
+    quick:
 spec:
   bindings:
     # A short identifier for the E2E test run

diff --git a/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml b/e2e/linodemachine-controller/minimal-linodemachine/chainsaw-test.yaml
@@ -6,7 +6,7 @@ metadata:
   name: minimal-linodemachine
   # Label to trigger the test on every PR
   labels:
-    on-pr:
+    quick:
 spec:
   bindings:
     # A short identifier for the E2E test run

diff --git a/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml b/e2e/linodemachine-controller/vpc-integration/chainsaw-test.yaml
@@ -6,7 +6,7 @@ metadata:
   name: vpc-integration
   # Label to trigger the test on every PR
   labels:
-    on-pr:
+    quick:
 spec:
   bindings:
     # A short identifier for the E2E test run

diff --git a/...linodeobjectstoragebucket-controller/minimal-linodeobjectstoragebucket/chainsaw-test.yaml b/...linodeobjectstoragebucket-controller/minimal-linodeobjectstoragebucket/chainsaw-test.yaml
@@ -5,7 +5,7 @@ metadata:
   name: minimal-linodeobjectstoragebucket
   # Label to trigger the test on every PR
   labels:
-    on-pr:
+    quick:
 spec:
   bindings:
     # A short identifier for the E2E test run

diff --git a/e2e/linodevpc-controller/minimal-linodevpc/chainsaw-test.yaml b/e2e/linodevpc-controller/minimal-linodevpc/chainsaw-test.yaml
@@ -5,7 +5,7 @@ metadata:
   name: minimal-linodevpc
   # Label to trigger the test on every PR
   labels:
-    on-pr:
+    quick:
 spec:
   bindings:
     # A short identifier for the E2E test run