[TryMOSK] Update build scripts
* move base images definition to build script
* add build specific inventory overrides to separate file
Related-Prod: PRODX-53424
Change-Id: Ic2104ff8ec221586333fcb78af7746f82df4687c
diff --git a/trymos/image_build/ansible/inventory/build_overrides.yaml b/trymos/image_build/ansible/inventory/build_overrides.yaml
new file mode 100644
index 0000000..3b274c3
--- /dev/null
+++ b/trymos/image_build/ansible/inventory/build_overrides.yaml
@@ -0,0 +1,4 @@
+all:
+ vars:
+ rvl_images_public_base_url: docker-dev-kaas-virtual.mcp.mirantis.com
+ rvl_binary_public_base_url: https://binary-dev-kaas-virtual.mcp.mirantis.com
diff --git a/trymos/image_build/build_image.sh b/trymos/image_build/build_image.sh
index b85db84..465b917 100755
--- a/trymos/image_build/build_image.sh
+++ b/trymos/image_build/build_image.sh
@@ -1,11 +1,9 @@
#!/bin/bash
set -ex
-export ENVIRONMENT=${ENVIRONMENT:-'mosk-25.1'}
-
-source env/${ENVIRONMENT}/packer.env
-
-export VM_NAME=${VM_NAME:-"trymosk-amd64-${ENVIRONMENT}-$(date +"%Y%m%d%H%M%S").qcow2"}
+export IMAGE_BASE_URL=${IMAGE_BASE_URL:-"https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"}
+export IMAGE_MD5_URL=${IMAGE_MD5_URL:-"https://cloud-images.ubuntu.com/jammy/current/MD5SUMS"}
+export VM_NAME=${VM_NAME:-"trymosk-amd64-$(date +"%Y%m%d%H%M%S").qcow2"}
export PACKER_LOG=${PACKER_LOG:-"1"}
export PACKER_IMAGES_CACHE=${PACKER_IMAGES_CACHE:-"./packer_images_cache"}
@@ -15,4 +13,12 @@
./config_drive.sh
+if [[ -f ansible/inventory/build_overrides.yaml ]]; then
+ curl --retry 6 --retry-delay 5 -L https://binary-dev-kaas-virtual.mcp.mirantis.com/openstack/bin/utils/yq/yq-v3.3.2 -o yq
+ chmod +x yq
+ ./yq merge ansible/inventory/build_overrides.yaml ../rockoon/virtual_lab/ansible/inventory/trymosk_single_node.yaml > ansible/inventory/trymosk_single_node.yaml
+else
+ cp ../rockoon/virtual_lab/ansible/inventory/trymosk_single_node.yaml ansible/inventory/trymosk_single_node.yaml
+fi
+
$PACKER_BINARY build -on-error=cleanup template.json
diff --git a/trymos/image_build/env/master/packer.env b/trymos/image_build/env/master/packer.env
deleted file mode 100644
index 6dac626..0000000
--- a/trymos/image_build/env/master/packer.env
+++ /dev/null
@@ -1,2 +0,0 @@
-export IMAGE_BASE_URL=${IMAGE_BASE_URL:-"https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"}
-export IMAGE_MD5_URL=${IMAGE_MD5_URL:-"https://cloud-images.ubuntu.com/jammy/current/MD5SUMS"}
diff --git a/trymos/image_build/env/mosk-25.1/packer.env b/trymos/image_build/env/mosk-25.1/packer.env
deleted file mode 100644
index 6dac626..0000000
--- a/trymos/image_build/env/mosk-25.1/packer.env
+++ /dev/null
@@ -1,2 +0,0 @@
-export IMAGE_BASE_URL=${IMAGE_BASE_URL:-"https://cloud-images.ubuntu.com/jammy/current/jammy-server-cloudimg-amd64.img"}
-export IMAGE_MD5_URL=${IMAGE_MD5_URL:-"https://cloud-images.ubuntu.com/jammy/current/MD5SUMS"}
diff --git a/trymos/image_build/scripts/build-image.sh b/trymos/image_build/scripts/build-image.sh
index 28acd66..ce14119 100755
--- a/trymos/image_build/scripts/build-image.sh
+++ b/trymos/image_build/scripts/build-image.sh
@@ -21,13 +21,11 @@
ansible-galaxy role install cloudalchemy.coredns
TOP_DIR="$(cd "$(dirname "$0")" && pwd)"
-INVENTORY_FILE="${TOP_DIR}/../rockoon/virtual_lab/ansible/inventory/trymosk_single_node.yaml"
-PRE_INSTALL_INVENTORY=/tmp/pre_install.yaml
+INVENTORY_FILE="${TOP_DIR}/ansible/inventory/trymosk_single_node.yaml"
HOSTNAME=$(hostname)
-cp ${INVENTORY_FILE} ${PRE_INSTALL_INVENTORY}
-sed -i "s/oc-virtual-lab-server-ctl-01/${HOSTNAME}/g" "${PRE_INSTALL_INVENTORY}"
+sed -i "s/oc-virtual-lab-server-ctl-01/${HOSTNAME}/g" "${INVENTORY_FILE}"
cd ${TOP_DIR}/ansible
-ansible-playbook -i "${PRE_INSTALL_INVENTORY}" build-image.yaml -vvv
+ansible-playbook -i "${INVENTORY_FILE}" build-image.yaml -vvv