Skip to content

Commit

Permalink
feat: updated build.sh to use a json for files
Browse files Browse the repository at this point in the history
Updated build.sh to allow for it to have the same look as download.sh for menu, also moved all build files into project.json.

Signed-off-by: Jared Burns <[email protected]>
  • Loading branch information
burnsjared0415 authored and tenthirtyam committed May 13, 2024
1 parent 649bbcb commit 41a5cc8
Show file tree
Hide file tree
Showing 28 changed files with 1,450 additions and 1,720 deletions.
8 changes: 4 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -186,17 +186,17 @@ Oracle-Linux-8:
CentOS-Stream-9:
extends: .packer-build
variables:
INPUT_PATH: "$SCRIPT_PATH/builds/linux/centos/9-stream/"
BUILD_VARS: "linux-centos-9-stream.pkrvars.hcl"
INPUT_PATH: "$SCRIPT_PATH/builds/linux/centos/9/"
BUILD_VARS: "linux-centos-9.pkrvars.hcl"
EXTRA_VAR_FILES: "-var-file=$CONFIG_PATH/network.pkrvars.hcl -var-file=$CONFIG_PATH/linux-storage.pkrvars.hcl"

##############################################################################

CentOS-Stream-8:
extends: .packer-build
variables:
INPUT_PATH: "$SCRIPT_PATH/builds/linux/centos/8-stream/"
BUILD_VARS: "linux-centos-8-stream.pkrvars.hcl"
INPUT_PATH: "$SCRIPT_PATH/builds/linux/centos/8/"
BUILD_VARS: "linux-centos-8.pkrvars.hcl"
EXTRA_VAR_FILES: "-var-file=$CONFIG_PATH/network.pkrvars.hcl -var-file=$CONFIG_PATH/linux-storage.pkrvars.hcl"

##############################################################################
Expand Down
1 change: 0 additions & 1 deletion .trunk/tools

This file was deleted.

24 changes: 13 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,25 @@
- Updates Windows Desktop Enterprise Edition to support the default use of evaluation mode.
[#908](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/908)

**Note**: Professional Edition does not support evaluation mode. Microsoft Evaluation Center only
provides support for Enterprise Edition. Please see the
[FAQ](https://vmware-samples.github.io/packer-examples-for-vsphere/getting-started/faq/) for
additional details.
**Note**: Professional Edition does not support evaluation mode. Microsoft Evaluation Center only
provides support for Enterprise Edition. Please see the
[FAQ](https://vmware-samples.github.io/packer-examples-for-vsphere/getting-started/faq/) for
additional details.

- Updates Windows Server 2025 Insiders Preview default values to allow for deployment.
[#907](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/907)
- `vm_inst_os_eval = true` >> `false` (Requires key)
- `vm_inst_os_kms_key_standard` >> `vm_inst_os_key_standard`
- `vm_inst_os_kms_key_datacenter` >> `vm_inst_os_key_datacenter`
- `vm_inst_os_eval = true` >> `false` (Requires key)
- `vm_inst_os_kms_key_standard` >> `vm_inst_os_key_standard`
- `vm_inst_os_kms_key_datacenter` >> `vm_inst_os_key_datacenter`

**Enhancement**:

- Adds a script (`./download.sh`) and a configuration (`project.json`) to assist in the download of
the guest operating systems.
- Adds a download script (`./download.sh`) and a JSON configuration file (`project.json`) to assist
in the download of the guest operating systems.
[#874](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/874),
[#877](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/877)
- Refactored the build script (`./build.sh`) to provide the same experience as the download script.
[#910](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/910)
- Adds Ubuntu Server 24.04 LTS to the project.
[#891](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/891)
- Adds Fedora Server 40 Linux distribution to the project.
Expand Down Expand Up @@ -63,8 +65,8 @@

- Removes Ubuntu Server 23.10 from the project; superseded by 24.04 LTS.
[#891](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/891)
- Update ansible core version from 2.15 to 2.16
- [#921](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/921)
- Update ansible-core version from 2.15 to 2.16.
[#921](https://github.com/vmware-samples/packer-examples-for-vsphere/pull/921)

## v0.19.1

Expand Down
6 changes: 2 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ docs-uninstall:
pip uninstall mkdocs-material mkdocs -y
pip uninstall -r .github/workflows/requirements.txt -y

.PHONY: update-build-script update-gitlab-ci
update-build-script:
gomplate -c build.yaml -f build.tmpl -o build.sh
.PHONY: update-gitlab-ci

update-gitlab-ci:
gomplate -c build.yaml -f build-ci.tmpl -o .gitlab-ci.yml
gomplate -c build-ci.yaml -f build-ci.tmpl -o .gitlab-ci.yml
2 changes: 1 addition & 1 deletion build-ci.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ variables:

##############################################################################

{{ range $menu := (ds "build").menu -}}
{{ range $menu := (ds "build-ci").menu -}}
{{ range $submenu := $menu.submenu -}}

{{ $submenu.entry | strings.ReplaceAll " (cloud-init)" "" | strings.ReplaceAll " " "-" | strings.ReplaceAll "---" "-" }}:
Expand Down
4 changes: 2 additions & 2 deletions build.yaml → build-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ menu:
- "linux-storage.pkrvars.hcl"
- entry: "CentOS Stream 9"
build:
path: "builds/linux/centos/9-stream/"
path: "builds/linux/centos/9/"
var_files:
- "network.pkrvars.hcl"
- "linux-storage.pkrvars.hcl"
- entry: "CentOS Stream 8"
build:
path: "builds/linux/centos/8-stream/"
path: "builds/linux/centos/8/"
var_files:
- "network.pkrvars.hcl"
- "linux-storage.pkrvars.hcl"
Expand Down

0 comments on commit 41a5cc8

Please sign in to comment.