Merge pull request #13 from mesosphere/julferts/change-runners

change runners
mesosphere · Aug 19, 2024 · 3f8b9c6 · 3f8b9c6
2 parents cf53147 + 672362a
commit 3f8b9c6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,12 +5,12 @@ on:
   push:
     tags:
       - 'v*'
+  workflow_dispatch:
 jobs:
   release:
     name: Create D2iQ Templates
     runs-on: 
-    - self-hosted
-    - small
+    - self-hosted-nutanix-medium
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -8,8 +8,7 @@ on:
 jobs:
   base_image_tests:
     runs-on: 
-    - self-hosted
-    - small
+    - self-hosted-nutanix-medium
     strategy:
       fail-fast: false
       matrix:
@@ -18,7 +17,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
         with:
-          ref: "${{ github.event.pull_request.merge_commit_sha }}"
+          ref: "${{ github.event.pull_request.head.sha }}"
       - name: Setup requirements
         if: contains(github.event.pull_request.labels.*.name, 'integration_test')
         run: |

diff --git a/bootfiles/centos/centos7.ks b/bootfiles/centos/centos7.ks
@@ -47,6 +47,9 @@ reboot
 
 # The %post section is essentially a shell script
 %post --erroronfail
+sed -i 's/mirrorlist/#mirrorlist/g' /etc/yum.repos.d/CentOS-*
+sed -i 's|#baseurl=http://mirror.centos.org|baseurl=http://vault.centos.org|g' /etc/yum.repos.d/CentOS-*
+
 # Update the root certificates
 update-ca-trust force-enable
 # Passwordless sudo for the user '${ssh_username}'

diff --git a/scripts/el/install_cloud_tools.sh b/scripts/el/install_cloud_tools.sh
@@ -11,6 +11,8 @@ if [ "$major_version" -ge 8 ]; then
     dnf -y install open-vm-tools cloud-init cloud-utils-growpart
 else
     # with el7 we install cloud-init from source
-    yum install -y open-vm-tools cloud-init cloud-utils-growpart dracut-modules-growroot https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-    yum install -y python2-pip
+    yum install -y open-vm-tools cloud-init cloud-utils-growpart dracut-modules-growroot https://dl.fedoraproject.org/pub/archive/epel/7/x86_64/Packages/e/epel-release-7-14.noarch.rpm
+    yum install -y python2-pip python-netifaces python2-oauthlib python2-jsonschema
+    pip install https://files.pythonhosted.org/packages/d3/bb/d10e531b297dd1d46f6b1fd11d018247af9f2d460037554bb7bb9011c6ac/configobj-5.0.8-py2.py3-none-any.whl
+    yum install -y python36-pip
 fi