ci: bump macos version to 13

kubernetes · Apr 15, 2024 · 3dfd18a · 3dfd18a
1 parent e310e14
commit 3dfd18a
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 8 deletions.
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
@@ -409,7 +409,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: Install kubectl
         shell: bash
@@ -429,6 +429,12 @@ jobs:
         run: |
           brew install docker-machine docker
           sudo docker --version
+      - name: Install vbox
+        shell: bash
+        run: |
+          sudo spctl --master-disable
+          brew install --cask virtualbox 
+          brew install --cask virtualbox-extension-pack
       - name: Info
         shell: bash
         run: |
@@ -455,7 +461,7 @@ jobs:
           chmod a+x e2e-*
           chmod a+x minikube-*
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox  -test.run "TestFunctional" -test.timeout=35m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox  -test.run "TestFunctional" -test.timeout=55m -test.v -timeout-multiplier=1.8 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))
@@ -635,4 +641,4 @@ jobs:
       - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: all_reports
-          path: all_reports
+          path: all_reports
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: Install kubectl
         shell: bash
@@ -547,6 +547,16 @@ jobs:
         run: |
           brew install docker-machine docker
           sudo docker --version
+      - 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: Info
         shell: bash
         run: |
@@ -574,7 +584,7 @@ jobs:
           chmod a+x minikube-*
           MINIKUBE_HOME=$(pwd)/testhome ./minikube-darwin-amd64 delete --all --purge
           START_TIME=$(date -u +%s)
-          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox  -test.run "TestFunctional" -test.timeout=35m -test.v -timeout-multiplier=1.5 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt
+          KUBECONFIG=$(pwd)/testhome/kubeconfig MINIKUBE_HOME=$(pwd)/testhome ./e2e-darwin-amd64 -minikube-start-args=--vm-driver=virtualbox  -test.run "TestFunctional" -test.timeout=55m -test.v -timeout-multiplier=1.8 -binary=./minikube-darwin-amd64 2>&1 | tee ./report/testout.txt
           END_TIME=$(date -u +%s)
           TIME_ELAPSED=$(($END_TIME-$START_TIME))
           min=$((${TIME_ELAPSED}/60))
@@ -757,4 +767,4 @@ jobs:
       - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: all_reports
-          path: all_reports
+          path: all_reports
diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml
@@ -32,7 +32,7 @@ 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 }}
@@ -58,4 +58,4 @@ jobs:
           ./hack/benchmark/time-to-k8s/public-chart/public-chart.sh virtualbox docker
       - name: Benchmark time-to-k8s for VirtualBox driver with containerd runtime
         run: |
-          ./hack/benchmark/time-to-k8s/public-chart/public-chart.sh virtualbox containerd
+          ./hack/benchmark/time-to-k8s/public-chart/public-chart.sh virtualbox containerd
diff --git a/.github/workflows/virtual_box_rerun.yml b/.github/workflows/virtual_box_rerun.yml
@@ -0,0 +1,35 @@
+# This is a basic workflow to help you get started with Actions
+
+name: virtual-box-functional-test-rerun
+
+# Controls when the workflow will run
+on:
+  workflow_run:
+    workflows: ["PR"]
+    branches: ["**"]
+    types: 
+      - completed
+
+env:
+  GH_TOKEN: ${{ github.token }}
+jobs:
+  check-and-rerun:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: CheckArm64AndRerun
+        run: | 
+          set +e
+          gh run view ${{ github.event.workflow_run.id }} --log | grep ':type=>:arm'
+          RET=$?
+          echo "grep returns $RET"
+          set -e
+          if [ $RET == 0 ] 
+          then
+              JOBID=`gh run view ${{ github.event.workflow_run.id }} --json jobs | jq '.jobs[] | select ( .name == "functional_virtualbox_macos") | .databaseId'`
+              echo "rerun workflow ${{ github.event.workflow_run.id }} job $JOBID"
+              gh run rerun --job $JOBID
+          fi
+          exit 0