updates

linode · Apr 22, 2024 · 5d70665 · 5d70665
1 parent 54b63e0
commit 5d70665
Show file tree

Hide file tree

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

diff --git a/Makefile b/Makefile
@@ -147,7 +147,7 @@ test: generate fmt vet envtest ## Run tests.
 
 .PHONY: e2etest
 e2etest: generate local-deploy chainsaw
-	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e
+	GIT_REF=$(GIT_REF) $(CHAINSAW) test ./e2e --assert-timeout 600s
 
 .PHONY: e2etest-pr
 e2etest-pr: generate local-deploy chainsaw

diff --git a/e2e/default-full-cluster/04-error.yaml → e2e/default-full-cluster/03-error.yaml b/e2e/default-full-cluster/04-error.yaml → e2e/default-full-cluster/03-error.yaml
diff --git a/...ault-full-cluster/06-cleanup-cluster.yaml → ...ault-full-cluster/04-cleanup-cluster.yaml b/...ault-full-cluster/06-cleanup-cluster.yaml → ...ault-full-cluster/04-cleanup-cluster.yaml
diff --git a/e2e/default-full-cluster/chainsaw-test.yaml b/e2e/default-full-cluster/chainsaw-test.yaml
@@ -24,7 +24,7 @@ spec:
         file: 01-create-cluster.yaml
     - assert:
         file: 02-assert.yaml
-  - name: step-03
+  - name: step-02
     try:
     - script:
         env:
@@ -47,16 +47,16 @@ spec:
           ($error): ~
           (json_parse($stdout)):
             results: 2
-  - name: step-04
+  - name: step-03
     try:
     - delete:
         ref:
           apiVersion: cluster.x-k8s.io/v1beta1
           kind: Cluster
           name: ($cluster)
     - error:
-        file: 04-error.yaml
-  - name: step-05
+        file: 03-error.yaml
+  - name: step-04
     try:
     - script:
         env:
@@ -79,7 +79,7 @@ spec:
           ($error): ~
           (json_parse($stdout)):
             results: 0
-  - name: step-06
+  - name: step-05
     try:
     - apply:
-        file: 06-cleanup-cluster.yaml
+        file: 04-cleanup-cluster.yaml