bump gh action runners to macos 13 and verify x86

medyagh · Jul 9, 2024 · a6210a7 · a6210a7
1 parent 05afde5
commit a6210a7
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -408,7 +408,7 @@ jobs:
       JOB_NAME: "functional_virtualbox_macos"
       GOPOGH_RESULT: ""
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Verify x86_64 architecture 
         shell: bash
@@ -419,6 +419,16 @@ jobs:
               exit -1
           fi
           exit 0
+      - name: Install vbox
+          shell: bash
+          run: |
+            brew update
+            brew search virtualbox
+            sudo spctl --master-disable
+            brew install --cask virtualbox 
+            curl -O -L "https://download.virtualbox.org/virtualbox/7.0.14/Oracle_VM_VirtualBox_Extension_Pack-7.0.14.vbox-extpack"
+            # Get SHAs from installing it manually once and then it will spit out the SHA for batch installation
+            echo "y" | sudo VBoxManage extpack install Oracle_VM_VirtualBox_Extension_Pack-7.0.14.vbox-extpack --accept-license=33d7284dc4a0ece381196fda3cfe2ed0e1e8e7ed7f27b9a9ebc4ee22e24bd23c
       - name: Install kubectl
         shell: bash
         run: |

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -527,7 +527,7 @@ jobs:
       JOB_NAME: "functional_virtualbox_macos"
       GOPOGH_RESULT: ""
       SHELL: "/bin/bash" # To prevent https://github.com/kubernetes/minikube/issues/6643
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Verify x86_64 architecture 
         shell: bash
@@ -538,6 +538,16 @@ jobs:
               exit -1
           fi
           exit 0
+      - name: Install vbox
+          shell: bash
+          run: |
+            brew update
+            brew search virtualbox
+            sudo spctl --master-disable
+            brew install --cask virtualbox 
+            curl -O -L "https://download.virtualbox.org/virtualbox/7.0.14/Oracle_VM_VirtualBox_Extension_Pack-7.0.14.vbox-extpack"
+            # Get SHAs from installing it manually once and then it will spit out the SHA for batch installation
+            echo "y" | sudo VBoxManage extpack install Oracle_VM_VirtualBox_Extension_Pack-7.0.14.vbox-extpack --accept-license=33d7284dc4a0ece381196fda3cfe2ed0e1e8e7ed7f27b9a9ebc4ee22e24bd23c
       - name: Install kubectl
         shell: bash
         run: |

diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml
@@ -31,13 +31,32 @@ jobs:
           ./hack/benchmark/time-to-k8s/public-chart/public-chart.sh docker containerd
   time-to-k8s-public-chart-virtualbox:
     if: github.repository == 'kubernetes/minikube'
-    runs-on: macos-12
+    runs-on: macos-13
     env:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
       AWS_DEFAULT_REGION: 'us-west-1'
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332
+      - name: Verify x86_64 architecture 
+        shell: bash
+        run: |
+          if [ $(uname -m) != "x86_64" ] 
+          then 
+              echo "$(uname -m) detected. This test must be run on x86_64"
+              exit -1
+          fi
+          exit 0
+      - name: Install vbox
+          shell: bash
+          run: |
+            brew update
+            brew search virtualbox
+            sudo spctl --master-disable
+            brew install --cask virtualbox 
+            curl -O -L "https://download.virtualbox.org/virtualbox/7.0.14/Oracle_VM_VirtualBox_Extension_Pack-7.0.14.vbox-extpack"
+            # Get SHAs from installing it manually once and then it will spit out the SHA for batch installation
+            echo "y" | sudo VBoxManage extpack install Oracle_VM_VirtualBox_Extension_Pack-7.0.14.vbox-extpack --accept-license=33d7284dc4a0ece381196fda3cfe2ed0e1e8e7ed7f27b9a9ebc4ee22e24bd23c
       - name: Install kubectl
         shell: bash
         run: |