diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 657dd5f63..b53ed04bb 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -33,53 +33,45 @@ jobs: with: EXCLUDE_REGEX: 'amazonlinux-2.*|rhel.*|sles.*|solaris.*|windows-11-aarch64.*,macos-*' -# packer-lint: -# uses: chef/github-workflows/.github/workflows/packer-lint.yml@main -# secrets: inherit - - pkr-bld-amazonlinux-arm64: - uses: ./.github/workflows/pkr-bld-amazonlinux-arm64.yml - secrets: inherit - - pkr-bld-amazonlinux-x64: - uses: ./.github/workflows/pkr-bld-amazonlinux-x64.yml + packer-lint: + uses: chef/github-workflows/.github/workflows/packer-lint.yml@main secrets: inherit - pkr-bld-hyperv-x64: - uses: ./.github/workflows/pkr-bld-hyperv-x64.yml - secrets: inherit + pkr-bld-hyperv-x64: + uses: ./.github/workflows/pkr-bld-hyperv-x64.yml + secrets: inherit - pkr-bld-parallels-arm64: - uses: ./.github/workflows/pkr-bld-parallels-arm64.yml - secrets: inherit + pkr-bld-parallels-arm64: + uses: ./.github/workflows/pkr-bld-parallels-arm64.yml + secrets: inherit - pkr-bld-parallels-x64: - uses: ./.github/workflows/pkr-bld-parallels-x64.yml - secrets: inherit + pkr-bld-parallels-x64: + uses: ./.github/workflows/pkr-bld-parallels-x64.yml + secrets: inherit - pkr-bld-qemu-arm64: - uses: ./.github/workflows/pkr-bld-qemu-arm64.yml - secrets: inherit + pkr-bld-qemu-arm64: + uses: ./.github/workflows/pkr-bld-qemu-arm64.yml + secrets: inherit - pkr-bld-qemu-x64: - uses: ./.github/workflows/pkr-bld-qemu-x64.yml - secrets: inherit + pkr-bld-qemu-x64: + uses: ./.github/workflows/pkr-bld-qemu-x64.yml + secrets: inherit - pkr-bld-virtualbox-arm64: - uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml - secrets: inherit + pkr-bld-virtualbox-arm64: + uses: ./.github/workflows/pkr-bld-virtualbox-arm64.yml + secrets: inherit - pkr-bld-virtualbox-x64: - uses: ./.github/workflows/pkr-bld-virtualbox-x64.yml - secrets: inherit + pkr-bld-virtualbox-x64: + uses: ./.github/workflows/pkr-bld-virtualbox-x64.yml + secrets: inherit - pkr-bld-vmware-arm64: - uses: ./.github/workflows/pkr-bld-vmware-arm64.yml - secrets: inherit + pkr-bld-vmware-arm64: + uses: ./.github/workflows/pkr-bld-vmware-arm64.yml + secrets: inherit - pkr-bld-vmware-x64: - uses: ./.github/workflows/pkr-bld-vmware-x64.yml - secrets: inherit + pkr-bld-vmware-x64: + uses: ./.github/workflows/pkr-bld-vmware-x64.yml + secrets: inherit check_jobs_pass: if: always() diff --git a/.github/workflows/pkr-bld-amazonlinux-arm64.yml b/.github/workflows/pkr-bld-amazonlinux-arm64.yml deleted file mode 100644 index ffa8f35b3..000000000 --- a/.github/workflows/pkr-bld-amazonlinux-arm64.yml +++ /dev/null @@ -1,61 +0,0 @@ ---- -on: - workflow_call: - -env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - # PACKER_LOG: "1" - -jobs: - aarch64: - runs-on: [self-hosted, ARM64, virtualbox] - strategy: - fail-fast: false - matrix: - os: - - amazonlinux-2023 - steps: - - name: Checkout - uses: actions/checkout@main - - name: Install Vagrant Virtualbox - run: | - brew tap hashicorp/tap - brew update - brew install qemu - brew install --cask hashicorp/tap/hashicorp-vagrant - brew install --cask virtualbox - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Checkout - uses: actions/checkout@main - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem - - name: Bento build - run: | - eval "$(chef shell-init bash)" - export LOGNAME=$USER - ./${{ matrix.os }}-aarch64-virtualbox-build.sh - ls -alh builds - cat builds/${{ matrix.os }}*-x86_64._metadata.json - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - export LOGNAME=$USER - bento test - - name: Upload build artifact - uses: actions/upload-artifact@v4 - with: - name: "${{ matrix.os }}-virtualbox-x86_64" - path: | - builds/*.box - builds/*.json - overwrite: true - retention-days: 10 - compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-amazonlinux-x64.yml b/.github/workflows/pkr-bld-amazonlinux-x64.yml deleted file mode 100644 index c28dc0a74..000000000 --- a/.github/workflows/pkr-bld-amazonlinux-x64.yml +++ /dev/null @@ -1,66 +0,0 @@ ---- -on: - workflow_call: - -env: - PACKER_GITHUB_API_TOKEN: "${{ secrets.GITHUB_TOKEN }}" - # PACKER_LOG: "1" - -jobs: - x86_64: - runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - os: - - amazonlinux-2023 - steps: - - name: Install Vagrant and VirtualBox - run: | - wget -O- https://apt.releases.hashicorp.com/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/hashicorp-archive-keyring.gpg - wget -O- https://www.virtualbox.org/download/oracle_vbox_2016.asc | gpg --dearmor | sudo tee /usr/share/keyrings/oracle-virtualbox-2016.gpg - echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list - echo "deb [signed-by=/usr/share/keyrings/oracle-virtualbox-2016.gpg] https://download.virtualbox.org/virtualbox/debian $(lsb_release -cs) contrib" | sudo tee /etc/apt/sources.list.d/virtualbox.list - sudo apt-get update - sudo apt-get install -y software-properties-common vagrant virtualbox-7.1 qemu-utils genisoimage - VBoxManage --version - vagrant --version - - name: Install Chef - uses: actionshub/chef-install@3.0.0 - - name: Setup Packer - uses: hashicorp/setup-packer@main - with: - version: latest - - name: Checkout - uses: actions/checkout@main - - name: Install Bento - run: | - eval "$(chef shell-init bash)" - gem build bento.gemspec - gem install bento-*.gem - - name: Bento build - run: | - rm -rf builds - sudo mkdir -p /mnt/builds/iso - sudo chmod -R 777 /mnt/builds - sudo ln -s /mnt/builds ./ - eval "$(chef shell-init bash)" - export LOGNAME=$USER - ./${{ matrix.os }}-x86_64-virtualbox-build.sh - ls -alh builds - cat builds/${{ matrix.os }}*-x86_64._metadata.json - - name: Bento Test - run: | - eval "$(chef shell-init bash)" - export LOGNAME=$USER - bento test - - name: Upload build artifact - uses: actions/upload-artifact@v4 - with: - name: "${{ matrix.os }}-virtualbox-x86_64" - path: | - builds/*.box - builds/*.json - overwrite: true - retention-days: 10 - compression-level: 0 # no compression diff --git a/.github/workflows/pkr-bld-hyperv-x64.yml b/.github/workflows/pkr-bld-hyperv-x64.yml index eac1fa06b..b97a67eff 100644 --- a/.github/workflows/pkr-bld-hyperv-x64.yml +++ b/.github/workflows/pkr-bld-hyperv-x64.yml @@ -13,26 +13,11 @@ jobs: fail-fast: false matrix: os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - windows-11 + - windows-2016 + - windows-2019 + - windows-2022 + - windows-2025 provider: - hyperv-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-arm64.yml b/.github/workflows/pkr-bld-parallels-arm64.yml index ef850d0f4..dcd102cd7 100644 --- a/.github/workflows/pkr-bld-parallels-arm64.yml +++ b/.github/workflows/pkr-bld-parallels-arm64.yml @@ -13,23 +13,9 @@ jobs: fail-fast: false matrix: os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - macos-14 + - macos-15 + - windows-11 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-parallels-x64.yml b/.github/workflows/pkr-bld-parallels-x64.yml index 50c8d55b0..9f5ff460d 100644 --- a/.github/workflows/pkr-bld-parallels-x64.yml +++ b/.github/workflows/pkr-bld-parallels-x64.yml @@ -13,26 +13,13 @@ jobs: fail-fast: false matrix: os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - macos-14 + - macos-15 + - windows-11 + - windows-2016 + - windows-2019 + - windows-2022 + - windows-2025 provider: - parallels-iso steps: diff --git a/.github/workflows/pkr-bld-qemu-arm64.yml b/.github/workflows/pkr-bld-qemu-arm64.yml index a7a27197d..38d97f609 100644 --- a/.github/workflows/pkr-bld-qemu-arm64.yml +++ b/.github/workflows/pkr-bld-qemu-arm64.yml @@ -13,23 +13,7 @@ jobs: fail-fast: false matrix: os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - windows-11 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-qemu-x64.yml b/.github/workflows/pkr-bld-qemu-x64.yml index 3d5141615..0c9cec69d 100644 --- a/.github/workflows/pkr-bld-qemu-x64.yml +++ b/.github/workflows/pkr-bld-qemu-x64.yml @@ -13,26 +13,11 @@ jobs: fail-fast: false matrix: os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - windows-11 + - windows-2016 + - windows-2019 + - windows-2022 + - windows-2025 provider: - qemu steps: diff --git a/.github/workflows/pkr-bld-virtualbox-arm64.yml b/.github/workflows/pkr-bld-virtualbox-arm64.yml index 5bf795560..008974584 100644 --- a/.github/workflows/pkr-bld-virtualbox-arm64.yml +++ b/.github/workflows/pkr-bld-virtualbox-arm64.yml @@ -13,23 +13,7 @@ jobs: fail-fast: false matrix: os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - windows-11 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-virtualbox-x64.yml b/.github/workflows/pkr-bld-virtualbox-x64.yml index 4baa1f2d7..0e0dc6aa8 100644 --- a/.github/workflows/pkr-bld-virtualbox-x64.yml +++ b/.github/workflows/pkr-bld-virtualbox-x64.yml @@ -13,26 +13,11 @@ jobs: fail-fast: false matrix: os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - windows-11 + - windows-2016 + - windows-2019 + - windows-2022 + - windows-2025 provider: - virtualbox-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-arm64.yml b/.github/workflows/pkr-bld-vmware-arm64.yml index 203afaf57..962783029 100644 --- a/.github/workflows/pkr-bld-vmware-arm64.yml +++ b/.github/workflows/pkr-bld-vmware-arm64.yml @@ -13,23 +13,7 @@ jobs: fail-fast: false matrix: os: - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - windows-11 provider: - vmware-iso steps: diff --git a/.github/workflows/pkr-bld-vmware-x64.yml b/.github/workflows/pkr-bld-vmware-x64.yml index dfd8b3fff..2ca7228ee 100644 --- a/.github/workflows/pkr-bld-vmware-x64.yml +++ b/.github/workflows/pkr-bld-vmware-x64.yml @@ -13,26 +13,11 @@ jobs: fail-fast: false matrix: os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - windows-11 + - windows-2016 + - windows-2019 + - windows-2022 + - windows-2025 provider: - vmware-iso steps: diff --git a/.github/workflows/test-pkr-bld-parallels.yml b/.github/workflows/test-pkr-bld-parallels.yml index 86bd15bc9..95e097849 100644 --- a/.github/workflows/test-pkr-bld-parallels.yml +++ b/.github/workflows/test-pkr-bld-parallels.yml @@ -12,25 +12,13 @@ jobs: fail-fast: false matrix: os: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - debian-11 - - debian-12 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - macos-14 + - macos-15 + - windows-11 + - windows-2016 + - windows-2019 + - windows-2022 + - windows-2025 provider: - parallels-iso steps: diff --git a/builds.yml b/builds.yml index c6fa6c0be..92ef4dc59 100644 --- a/builds.yml +++ b/builds.yml @@ -1,66 +1,40 @@ --- -vagrant_cloud_account: 'bento' +vagrant_cloud_account: 'stromweld' default_architectures: - x86_64 - amd64 public: - - amazonlinux-2023 - - almalinux-8 - - almalinux-9 - - almalinux-10 - - centos-stream-9 - - centos-stream-10 - - debian-12 - - debian-13 - - fedora-41 - - fedora-42 - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - - ubuntu-22.04 - - ubuntu-24.04 + - 'macos-14' + - 'macos-15' + - 'windows-10' + - 'windows-11' + - 'windows-2016' + - 'windows-2019' + - 'windows-2022' + - 'windows-2025' # slug box name: text string from standard box name to match slugs: - - almalinux-8 - - almalinux-9 - - almalinux-10 - - debian-12 - - debian-13 - - fedora-latest - - freebsd-13 - - freebsd-14 - - opensuse-leap-15 - - oraclelinux-8 - - oraclelinux-9 - - oraclelinux-10 - - rockylinux-8 - - rockylinux-9 - - rockylinux-10 - macos-14 - macos-15 do_not_build: - amazon - - macos +# - macos - sles - solaris - rhel - - windows -# - almalinux -# - centos -# - debian -# - fedora -# - freebsd -# - opensuse-leap -# - oracle -# - rockylinux -# - ubuntu +# - windows + - almalinux + - centos + - debian + - fedora + - freebsd + - opensuse-leap + - oracle + - rockylinux + - scientificlinux + - springdalelinux + - ubuntu diff --git a/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl new file mode 100644 index 000000000..78423b8b0 --- /dev/null +++ b/os_pkrvars/windows/windows-10-x86_64.pkrvars.hcl @@ -0,0 +1,9 @@ +os_name = "windows" +os_version = "10" +os_arch = "x86_64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66750/19045.2006.220908-0225.22h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" +iso_checksum = "EF7312733A9F5D7D51CFA04AC497671995674CA5E1058D5164D6028F0938D668" +parallels_guest_os_type = "win-10" +vbox_guest_os_type = "Windows10_64" +vmware_guest_os_type = "windows9srv-64" diff --git a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl index fa598a714..dc924b91c 100644 --- a/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-aarch64.pkrvars.hcl @@ -1,3 +1,11 @@ +<<<<<<< HEAD +os_name = "windows" +os_version = "11" +os_arch = "aarch64" +is_windows = true +iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1.240331-1435.ge_release_CLIENTENTERPRISEEVAL_OEMRET_A64FRE_en-us.iso" +iso_checksum = "DAD633276073F14F3E0373EF7E787569E216D54942CE522B39451C8F2D38AD43" +======= os_name = "windows" os_version = "11" os_arch = "aarch64" @@ -7,6 +15,7 @@ hyperv_generation = 2 iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1.240331-1435.ge_release_CLIENTENTERPRISEEVAL_OEMRET_A64FRE_en-us.iso" iso_checksum = "DAD633276073F14F3E0373EF7E787569E216D54942CE522B39451C8F2D38AD43" sources_enabled = ["source.parallels-iso.vm", "source.qemu.vm", "source.vmware-iso.vm"] +>>>>>>> origin/main parallels_guest_os_type = "win-11" vbox_guest_os_type = "Other_arm64" vmware_guest_os_type = "arm-windows11-64" diff --git a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl index 0c05ae5b7..18b34ab46 100644 --- a/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-11-x86_64.pkrvars.hcl @@ -2,7 +2,11 @@ os_name = "windows" os_version = "11" os_arch = "x86_64" is_windows = true +<<<<<<< HEAD +# Windows 11 source requires a prompt to select OS to install. This allows the system time to add reg keys to ignore TPM Check before the install begins. +======= # Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-11-enterprise +>>>>>>> origin/main iso_url = "https://software-static.download.prss.microsoft.com/dbazure/888969d5-f34g-4e03-ac9d-1f9786c66749/26100.1742.240906-0331.ge_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso" iso_checksum = "755A90D43E826A74B9E1932A34788B898E028272439B777E5593DEE8D53622AE" parallels_guest_os_type = "win-11" diff --git a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl index 87614c762..6b3eb4b85 100644 --- a/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl +++ b/os_pkrvars/windows/windows-2019-x86_64.pkrvars.hcl @@ -1,8 +1,15 @@ +<<<<<<< HEAD +os_name = "windows" +os_version = "2019" +os_arch = "x86_64" +is_windows = true +======= os_name = "windows" os_version = "2019" os_arch = "x86_64" is_windows = true # Download url's found at https://www.microsoft.com/en-us/evalcenter/download-windows-server-2019 +>>>>>>> origin/main iso_url = "https://software-static.download.prss.microsoft.com/dbazure/988969d5-f34g-4e03-ac9d-1f9786c66749/17763.3650.221105-1748.rs5_release_svc_refresh_SERVER_EVAL_x64FRE_en-us.iso" iso_checksum = "6dae072e7f78f4ccab74a45341de0d6e2d45c39be25f1f5920a2ab4f51d7bcbb" parallels_guest_os_type = "win-2019"