From f82f2d24038587b4027fa18ca7cff19ac031d6bc Mon Sep 17 00:00:00 2001 From: skyamgarp <130442619+skyamgarp@users.noreply.github.com> Date: Tue, 28 Jan 2025 18:30:12 +0530 Subject: [PATCH] (PA-6764) Add MacOS 15 ARM to the install-puppet script (PA-6764) Remove Centos and ubuntu from github actions --- .github/workflows/install_puppet.yaml | 6 +----- install.sh | 3 ++- modules/facts | 2 +- modules/puppet_agent | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/install_puppet.yaml b/.github/workflows/install_puppet.yaml index 5e6b0ad..9c21850 100644 --- a/.github/workflows/install_puppet.yaml +++ b/.github/workflows/install_puppet.yaml @@ -6,8 +6,6 @@ on: pull_request: branches: [ main ] -# Even though checkout@v3 is end-of-life, we cannot upgrade to v4 -# because it cannot run on CentOS 7 and Ubuntu 18.04 jobs: install-puppet: name: ${{ matrix.collection }} / ${{ matrix.os.name }} @@ -17,11 +15,9 @@ jobs: matrix: collection: [ puppet7, puppet8 ] os: [ - { name: "CentOS 7", image: "litmusimage/centos:7" }, { name: "Debian 10", image: "litmusimage/debian:10" }, { name: "Debian 11", image: "litmusimage/debian:11" }, { name: "Debian 12", image: "litmusimage/debian:12" }, - { name: "Ubuntu 18.04", image: "litmusimage/ubuntu:18.04" }, { name: "Ubuntu 20.04", image: "litmusimage/ubuntu:20.04" }, { name: "Ubuntu 22.04", image: "litmusimage/ubuntu:22.04" }, ] @@ -29,7 +25,7 @@ jobs: image: ${{ matrix.os.image }} steps: - name: Checkout current PR - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 - name: Install puppet-agent from ${{ matrix.collection }} collection diff --git a/install.sh b/install.sh index 2bb7772..7986609 100755 --- a/install.sh +++ b/install.sh @@ -364,7 +364,7 @@ if [ -n "$PT_mac_source" ]; then mac_source=$PT_mac_source else if [ "$nightly" = true ]; then - mac_source='http://nightlies.puppet.com/downloads' + mac_source='https://artifactory.delivery.puppetlabs.net:443/artifactory/internal_nightly__local/downloads' else mac_source='http://downloads.puppet.com' fi @@ -481,6 +481,7 @@ if true; then "12") platform_version="12";; "13") platform_version="13";; "14") platform_version="14";; + "15") platform_version="15";; *) echo "No builds for platform: $major_version" exit 1 ;; diff --git a/modules/facts b/modules/facts index 0f413a6..b562392 160000 --- a/modules/facts +++ b/modules/facts @@ -1 +1 @@ -Subproject commit 0f413a6a30e93001d1da44e25efc141205ddf549 +Subproject commit b56239296c890e25357b5471fef1649e11de4ef1 diff --git a/modules/puppet_agent b/modules/puppet_agent index 4ba46ba..d12b00c 160000 --- a/modules/puppet_agent +++ b/modules/puppet_agent @@ -1 +1 @@ -Subproject commit 4ba46baaa9dc68d2a8adf35b335a405944cea9a9 +Subproject commit d12b00cd73cc9fa4b3108149b9a4f7a151d97529