fix: remove duplicate

Remove Ubuntu 23.10 duplicate in `build.yml`. Signed-off-by: Ryan Johnson <[email protected]>
vmware-samples · Feb 9, 2024 · f97f381 · f97f381
1 parent 95d84e8
commit f97f381
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 113 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -84,15 +84,6 @@ Ubuntu-Server-23.10:
 
 ##############################################################################
 
-Ubuntu-Server-23.10:
- extends: .packer-build
- variables:
- INPUT_PATH: "$SCRIPT_PATH/builds/linux/ubuntu/23-10/"
- BUILD_VARS: "linux-ubuntu-23-10.pkrvars.hcl"
- EXTRA_VAR_FILES: "-var-file=$CONFIG_PATH/network.pkrvars.hcl -var-file=$CONFIG_PATH/linux-storage.pkrvars.hcl"
-
-##############################################################################
-
 Ubuntu-Server-22.04-LTS:
  extends: .packer-build
  variables:

diff --git a/build.sh b/build.sh
@@ -250,43 +250,6 @@ menu_option_5() {
 }
 
 menu_option_6() {
- INPUT_PATH="$SCRIPT_PATH"/builds/linux/ubuntu/23-10/
- BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
- BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
-
- echo -e "\nCONFIRM: Build a Ubuntu Server 23.10 (cloud-init) Template for VMware vSphere?"
- echo -e "\nContinue? (y/n)"
- read -r REPLY
- if [[ ! $REPLY =~ ^[Yy]$ ]]; then
- exit 1
- fi
-
- ### Build a Ubuntu Server 23.10 (cloud-init) Template for VMware vSphere. ###
- echo "Building a Ubuntu Server 23.10 (cloud-init) Template for VMware vSphere..."
-
- ### Initialize HashiCorp Packer and required plugins. ###
- echo "Initializing HashiCorp Packer and required plugins..."
- packer init "$INPUT_PATH"
-
- ### Start the Build. ###
- echo "Starting the build...."
- echo "packer build -force -on-error=ask $debug_option"
- packer build -force -on-error=ask $debug_option \
- -var-file="$CONFIG_PATH/vsphere.pkrvars.hcl" \
- -var-file="$CONFIG_PATH/build.pkrvars.hcl" \
- -var-file="$CONFIG_PATH/ansible.pkrvars.hcl" \
- -var-file="$CONFIG_PATH/proxy.pkrvars.hcl" \
- -var-file="$CONFIG_PATH/common.pkrvars.hcl" \
- -var-file="$CONFIG_PATH/network.pkrvars.hcl" \
- -var-file="$CONFIG_PATH/linux-storage.pkrvars.hcl" \
- -var-file="$CONFIG_PATH/$BUILD_VARS" \
- "$INPUT_PATH"
-
- ### Build Complete. ###
- echo "Build Complete."
-}
-
-menu_option_7() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/ubuntu/22-04-lts/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -323,7 +286,7 @@ menu_option_7() {
  echo "Build Complete."
 }
 
-menu_option_8() {
+menu_option_7() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/ubuntu/20-04-lts/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -360,7 +323,7 @@ menu_option_8() {
  echo "Build Complete."
 }
 
-menu_option_9() {
+menu_option_8() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/rhel/9/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -398,7 +361,7 @@ menu_option_9() {
  echo "Build Complete."
 }
 
-menu_option_10() {
+menu_option_9() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/rhel/8/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -436,7 +399,7 @@ menu_option_10() {
  echo "Build Complete."
 }
 
-menu_option_11() {
+menu_option_10() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/rhel/7/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -474,7 +437,7 @@ menu_option_11() {
  echo "Build Complete."
 }
 
-menu_option_12() {
+menu_option_11() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/almalinux/9/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -511,7 +474,7 @@ menu_option_12() {
  echo "Build Complete."
 }
 
-menu_option_13() {
+menu_option_12() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/almalinux/8/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -548,7 +511,7 @@ menu_option_13() {
  echo "Build Complete."
 }
 
-menu_option_14() {
+menu_option_13() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/rocky/9/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -585,7 +548,7 @@ menu_option_14() {
  echo "Build Complete."
 }
 
-menu_option_15() {
+menu_option_14() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/rocky/8/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -622,7 +585,7 @@ menu_option_15() {
  echo "Build Complete."
 }
 
-menu_option_16() {
+menu_option_15() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/oracle/9/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -659,7 +622,7 @@ menu_option_16() {
  echo "Build Complete."
 }
 
-menu_option_17() {
+menu_option_16() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/oracle/8/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -696,7 +659,7 @@ menu_option_17() {
  echo "Build Complete."
 }
 
-menu_option_18() {
+menu_option_17() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/centos/9-stream/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -733,7 +696,7 @@ menu_option_18() {
  echo "Build Complete."
 }
 
-menu_option_19() {
+menu_option_18() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/centos/8-stream/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -770,7 +733,7 @@ menu_option_19() {
  echo "Build Complete."
 }
 
-menu_option_20() {
+menu_option_19() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/centos/7/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -807,7 +770,7 @@ menu_option_20() {
  echo "Build Complete."
 }
 
-menu_option_21() {
+menu_option_20() {
  INPUT_PATH="$SCRIPT_PATH"/builds/linux/sles/15/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -844,7 +807,7 @@ menu_option_21() {
 }
 
 
-menu_option_22() {
+menu_option_21() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2025/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -877,7 +840,7 @@ menu_option_22() {
  echo "Build Complete."
 }
 
-menu_option_23() {
+menu_option_22() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2025/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -911,7 +874,7 @@ menu_option_23() {
  echo "Build Complete."
 }
 
-menu_option_24() {
+menu_option_23() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2025/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -945,7 +908,7 @@ menu_option_24() {
  echo "Build Complete."
 }
 
-menu_option_25() {
+menu_option_24() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2022/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -978,7 +941,7 @@ menu_option_25() {
  echo "Build Complete."
 }
 
-menu_option_26() {
+menu_option_25() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2022/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1012,7 +975,7 @@ menu_option_26() {
  echo "Build Complete."
 }
 
-menu_option_27() {
+menu_option_26() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2022/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1046,7 +1009,7 @@ menu_option_27() {
  echo "Build Complete."
 }
 
-menu_option_28() {
+menu_option_27() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2019/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1079,7 +1042,7 @@ menu_option_28() {
  echo "Build Complete."
 }
 
-menu_option_29() {
+menu_option_28() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2019/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1113,7 +1076,7 @@ menu_option_29() {
  echo "Build Complete."
 }
 
-menu_option_30() {
+menu_option_29() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/server/2019/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1147,7 +1110,7 @@ menu_option_30() {
  echo "Build Complete."
 }
 
-menu_option_31() {
+menu_option_30() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/11/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1180,7 +1143,7 @@ menu_option_31() {
  echo "Build Complete."
 }
 
-menu_option_32() {
+menu_option_31() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/11/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1214,7 +1177,7 @@ menu_option_32() {
  echo "Build Complete."
 }
 
-menu_option_33() {
+menu_option_32() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/11/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1248,7 +1211,7 @@ menu_option_33() {
  echo "Build Complete."
 }
 
-menu_option_34() {
+menu_option_33() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/10/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1281,7 +1244,7 @@ menu_option_34() {
  echo "Build Complete."
 }
 
-menu_option_35() {
+menu_option_34() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/10/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1315,7 +1278,7 @@ menu_option_35() {
  echo "Build Complete."
 }
 
-menu_option_36() {
+menu_option_35() {
  INPUT_PATH="$SCRIPT_PATH"/builds/windows/desktop/10/
  BUILD_PATH=${INPUT_PATH#"${SCRIPT_PATH}/builds/"}
  BUILD_VARS="$(echo "${BUILD_PATH%/}" | tr -s '/' | tr '/' '-').pkrvars.hcl"
@@ -1382,40 +1345,39 @@ until [ "$selection" = "0" ]; do
  echo " 3 - Debian 12"
  echo " 4 - Debian 11"
  echo " 5 - Ubuntu Server 23.10 (cloud-init)"
- echo " 6 - Ubuntu Server 23.10 (cloud-init)"
- echo " 7 - Ubuntu Server 22.04 LTS (cloud-init)"
- echo " 8 - Ubuntu Server 20.04 LTS (cloud-init)"
- echo " 9 - Red Hat Enterprise Linux 9"
- echo " 10 - Red Hat Enterprise Linux 8"
- echo " 11 - Red Hat Enterprise Linux 7"
- echo " 12 - AlmaLinux OS 9"
- echo " 13 - AlmaLinux OS 8"
- echo " 14 - Rocky Linux 9"
- echo " 15 - Rocky Linux 8"
- echo " 16 - Oracle Linux 9"
- echo " 17 - Oracle Linux 8"
- echo " 18 - CentOS Stream 9"
- echo " 19 - CentOS Stream 8"
- echo " 20 - CentOS Linux 7"
- echo " 21 - SUSE Linux Enterprise Server 15"
+ echo " 6 - Ubuntu Server 22.04 LTS (cloud-init)"
+ echo " 7 - Ubuntu Server 20.04 LTS (cloud-init)"
+ echo " 8 - Red Hat Enterprise Linux 9"
+ echo " 9 - Red Hat Enterprise Linux 8"
+ echo " 10 - Red Hat Enterprise Linux 7"
+ echo " 11 - AlmaLinux OS 9"
+ echo " 12 - AlmaLinux OS 8"
+ echo " 13 - Rocky Linux 9"
+ echo " 14 - Rocky Linux 8"
+ echo " 15 - Oracle Linux 9"
+ echo " 16 - Oracle Linux 8"
+ echo " 17 - CentOS Stream 9"
+ echo " 18 - CentOS Stream 8"
+ echo " 19 - CentOS Linux 7"
+ echo " 20 - SUSE Linux Enterprise Server 15"
  echo ""
  echo " Microsoft Windows:"
  echo ""
- echo " 22 - Windows Server 2025 - All"
- echo " 23 - Windows Server 2025 - Standard Only"
- echo " 24 - Windows Server 2025 - Datacenter Only"
- echo " 25 - Windows Server 2022 - All"
- echo " 26 - Windows Server 2022 - Standard Only"
- echo " 27 - Windows Server 2022 - Datacenter Only"
- echo " 28 - Windows Server 2019 - All"
- echo " 29 - Windows Server 2019 - Standard Only"
- echo " 30 - Windows Server 2019 - Datacenter Only"
- echo " 31 - Windows 11 - All"
- echo " 32 - Windows 11 - Enterprise Only"
- echo " 33 - Windows 11 - Professional Only"
- echo " 34 - Windows 10 - All"
- echo " 35 - Windows 10 - Enterprise Only"
- echo " 36 - Windows 10 - Professional Only"
+ echo " 21 - Windows Server 2025 - All"
+ echo " 22 - Windows Server 2025 - Standard Only"
+ echo " 23 - Windows Server 2025 - Datacenter Only"
+ echo " 24 - Windows Server 2022 - All"
+ echo " 25 - Windows Server 2022 - Standard Only"
+ echo " 26 - Windows Server 2022 - Datacenter Only"
+ echo " 27 - Windows Server 2019 - All"
+ echo " 28 - Windows Server 2019 - Standard Only"
+ echo " 29 - Windows Server 2019 - Datacenter Only"
+ echo " 30 - Windows 11 - All"
+ echo " 31 - Windows 11 - Enterprise Only"
+ echo " 32 - Windows 11 - Professional Only"
+ echo " 33 - Windows 10 - All"
+ echo " 34 - Windows 10 - Enterprise Only"
+ echo " 35 - Windows 10 - Professional Only"
  echo ""
  echo " Other:"
  echo ""
@@ -1460,7 +1422,6 @@ until [ "$selection" = "0" ]; do
  33 ) clear ; menu_option_33 ; press_enter ;;
  34 ) clear ; menu_option_34 ; press_enter ;;
  35 ) clear ; menu_option_35 ; press_enter ;;
- 36 ) clear ; menu_option_36 ; press_enter ;;
  i|I ) clear ; info ; press_enter ;;
  q|Q ) clear ; exit ;;
  * ) clear ; incorrect_selection ; press_enter ;;