From 3785c0a7d7b43a33f677ad6dee866782d40c8173 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 19 Aug 2024 17:37:24 +0200 Subject: [PATCH 1/4] change runners --- .github/workflows/release.yaml | 4 ++-- .github/workflows/test.yaml | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 7dee08d..f137687 100644 --- 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 index 918d53e..60b30f5 100644 --- 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: From 91393808e43fb7d5100e5d705bb9e34953e1fb11 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 19 Aug 2024 17:56:49 +0200 Subject: [PATCH 2/4] remove python2 pip --- scripts/el/install_cloud_tools.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/el/install_cloud_tools.sh b/scripts/el/install_cloud_tools.sh index 0d0592c..d79e93c 100644 --- a/scripts/el/install_cloud_tools.sh +++ b/scripts/el/install_cloud_tools.sh @@ -12,5 +12,4 @@ if [ "$major_version" -ge 8 ]; then 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 fi From ad76676700dec9538107fed7687472d614823365 Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 19 Aug 2024 18:16:54 +0200 Subject: [PATCH 3/4] we must test the branch itself --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 60b30f5..20e71bf 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -17,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: | From 672362ad4bc4a1ce85589e4078a8eddbd1c5ef6e Mon Sep 17 00:00:00 2001 From: Jan Ulferts Date: Mon, 19 Aug 2024 23:30:12 +0200 Subject: [PATCH 4/4] fix mirror and package issues --- bootfiles/centos/centos7.ks | 3 +++ scripts/el/install_cloud_tools.sh | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bootfiles/centos/centos7.ks b/bootfiles/centos/centos7.ks index 0f72a06..7c24a96 100644 --- 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 index d79e93c..ab2c543 100644 --- a/scripts/el/install_cloud_tools.sh +++ b/scripts/el/install_cloud_tools.sh @@ -11,5 +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 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