chore: cleanup and prereq

cleanup step and better prereq for operator testing

Author: d4rkstar

.github/cisetup.sh

@@ -22,7 +22,6 @@ sudo apt-get -y install curl wget jq
 mkdir -p "$HOME/.local/bin"
 export PATH="$HOME/.local/bin:$PATH"
 
-# add ops bin (~/.ops/<os>-<arch>/bin). os is uname -s lowercase, map common arch names
 os="$(uname -s | tr '[:upper:]' '[:lower:]')"
 arch="$(uname -m)"
 case "$arch" in
@@ -39,8 +38,15 @@ URL="https://raw.githubusercontent.com/apache/openserverless-cli/refs/tags/v$VER
 curl -sL $URL | VERSION="$VER" bash ;\
 echo -e '#!/bin/bash\nops -wsk "$@"' >$HOME/.local/bin/wsk ; chmod +x $HOME/.local/bin/wsk ;\
 curl -sL https://taskfile.dev/install.sh | sh -s -- -d -b $HOME/.local/bin; \
-task --version && ops -t
+task --version; \
+echo "Installing ops prereq from $HOME" &&  ops -t
+
+# install prerequisites to run operator tests
+cd $GITHUB_WORKSPACE
+echo "Installing operator prereq from $GITHUB_WORKSPACE" && ops -t
 
 # Persist ops path for GitHub Actions steps
 echo "$RESOLVED_OPS_BIN" >> "$GITHUB_PATH"
 echo "$HOME/.local/bin" >> "$GITHUB_PATH"
+
+

.github/workflows/check.yml

@@ -26,6 +26,7 @@ on:
 jobs:
   check:
     name: Check OpenServerless Operator
+    #runs-on: [ self-hosted, Linux, X64 ]
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
@@ -54,9 +55,8 @@ jobs:
         run: bash .github/cisetup.sh
       - name: Kind
         run: |
-          cd $HOME && \
-          ops setup docker create && 
-          kind export kubeconfig --name nuvolaris
+          cd $HOME && ops setup docker create && \
+          kind export kubeconfig --name nuvolaris 
       - name: Install
         run: task setup
       - name: BuildAndLoad
@@ -74,5 +74,9 @@ jobs:
         run: task utest
         continue-on-error: false
       - name: Integration Test
-        run: task itest
+        run: ops -t && task itest
         continue-on-error: false
+      - name: Cleanup cluster
+        if: always()
+        run: |
+          kind delete cluster --name nuvolaris

.github/workflows/image.yml

@@ -27,8 +27,8 @@ on:
 jobs:
   image:
     name: Build OpenServerless Operator Image
-    #runs-on: ubuntu-22.04
-    runs-on: [ self-hosted, Linux, X64 ]
+    runs-on: ubuntu-22.04
+    #runs-on: [ self-hosted, Linux, X64 ]
     steps:
       - name: Remove unnecessary files
         run: |
@@ -92,4 +92,4 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Image
-        run: task buildx-and-push TAG="$IMG_TAG"     
+        run: task buildx-and-push TAG="$IMG_TAG"

clusters/kind/opsfile.yml

@@ -19,7 +19,7 @@ version: '3'
 
 vars:
   NAME: "nuvolaris"
-  KUBEFILE: "{{.OPS_TMP}}/kind-dev.kubeconfig"
+  KUBEFILE: "{{.OPS_TMP}}/kind.kubeconfig"
   DRY: ""
 
 env: