[ci] fix action

.github/workflows/pr-tests-helm-upgrade.yml

@@ -1,6 +1,12 @@
 name: PR Tests - Helm Upgrade
 
 on:
+  push:
+    paths:
+      - .github/workflows/pr-tests-helm-upgrade.yml
+      - tox.ini
+      - packages/grid/helm/syft/**
+
   pull_request:
     branches:
       - dev
@@ -13,19 +19,44 @@ on:
         description: "Run helm upgrade"
         required: false
 
+concurrency:
+  group: pr-tests-helm-upgrade
+  cancel-in-progress: true
+
 jobs:
   pr-tests-helm-upgrade:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v4
 
-      - name: Install Dependencies
+      - name: Install dependencies
         run: |
-          pip install --upgrade tox
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+          brew update
 
-      - name: Upgrade helm on latest beta
+          # Install python deps
+          pip install --upgrade pip
+          pip install tox
+
+          # Install kubernetes
+          brew install helm k3d devspace kubectl
+
+      - name: Setup cluster
         run: |
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
           tox -e dev.k8s.start
+
+      - name: Upgrade helm chart
+        run: |
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
           UPGRADE_TYPE=BetaToDev tox -e syft.test.helm.upgrade
-          tox -e dev.k8s.destroy
+
+      - name: Destroy cluster
+        if: always()
+        run: |
+          eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
+          tox -e dev.k8s.destroyall

tox.ini

@@ -922,7 +922,7 @@ description = Test helm upgrade
 changedir = {toxinidir}/packages/grid/
 passenv=HOME,USER,KUBE_CONTEXT
 setenv =
-    UPGRADE_TYPE = {env:UPGRADE_PATH:ProdToDev}
+    UPGRADE_TYPE = {env:UPGRADE_TYPE:ProdToDev}
 allowlist_externals =
     bash
 commands =
@@ -945,14 +945,17 @@ allowlist_externals =
     bash
     sudo
 commands =
+    ; check k3d version
+    bash -c 'k3d --version'
+
     ; create registry
     bash -c 'k3d registry create registry.localhost --port 5800 -v $HOME/.k3d-registry:/var/lib/registry || true'
 
     ; add patches to host
     bash -c 'if ! grep -q k3d-registry.localhost /etc/hosts; then sudo {envpython} scripts/patch_hosts.py --add-k3d-registry --fix-docker-hosts; fi'
 
     ; Fail this command if registry is not working
-    bash -c 'URL=http://k3d-registry.localhost:5800/v2/_catalog; curl -X GET $URL'
+    bash -c 'curl --retry 5 --retry-all-errors http://k3d-registry.localhost:5800/v2/_catalog'
 
 [testenv:dev.k8s.patch.coredns]
 description = Patch CoreDNS to resolve k3d-registry.localhost