much tidying up

This commit is contained in:
2026-03-29 21:46:33 -07:00
parent a201c7919a
commit e95dd3efd5
30 changed files with 944 additions and 186 deletions

View File

@ -35,13 +35,17 @@ pipeline {
// Generate the dynamic inventory file
sh """
set +x
jenkins_group=\$(echo ${env.BUILD_USER_GROUPS} | sed 's/,/\\n/g' | grep -v \$SERVER_SUBNET_GROUP | grep Jenkins | head -n 1)
jenkins_subnet_group=\$(echo ${env.BUILD_USER_GROUPS} | sed 's/,/\\n/g' | grep -e authenticated -e \$SERVER_SUBNET_GROUP | sort -rf | head -n 1)
jenkins_user=\$(echo ${env.BUILD_USER})
playbook_file="/var/jenkins_home/ansible/playbooks/ssd_health.yaml"
cd /var/jenkins_home/ansible
chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
/var/jenkins_home/ansible/inventory/inventory.sh -v -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip}
set -x
/var/jenkins_home/ansible/inventory/inventory.sh -p \$playbook_file -v -s -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip}
"""
}
@ -50,20 +54,31 @@ pipeline {
stage('Ansible Playbook') {
steps {
sh """
set +x
echo ${params.host_ip}
hash=\$(echo -n ${params.host_ip} | md5sum | cut -c 1-8)
inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
playbook_file="/var/jenkins_home/ansible/playbooks/ssd_health.yaml"
extra_vars=\$(echo " \
public_deploy=true \
AUTHORIZED_KEY=${AUTHORIZED_KEY} \
matt_public_key='${env.matt_public_key}' \
autologin_password=${env.autologin_password} \
cosmos_root_password='${env.cosmos_root_password}' \
cosmos_password='${env.cosmos_password}' \
host_ip=${params.host_ip} \
install_kiosk=${params.install_kiosk} \
service_only=${params.service_only} \
quick_refresh=${params.quick_refresh} \
rename_endpoint=${params.rename_endpoint} \
" | tr -s " ")
set -x
cd /var/jenkins_home/ansible
ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/ssd_health.yaml \
--ssh-common-args='-o StrictHostKeyChecking=no'\
--extra-vars "AUTHORIZED_KEY=${AUTHORIZED_KEY} host_ip=${params.host_ip} \
matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
autologin_password=${env.autologin_password} cosmos_root_password='${env.cosmos_root_password}' \
cosmos_password='${env.cosmos_password}' install_kiosk=${params.install_kiosk} \
service_only=${params.service_only} quick_refresh=${params.quick_refresh} \
rename_endpoint=${params.rename_endpoint} "
ansible-playbook -i \$inventory_file \$playbook_file \
--ssh-common-args='-o StrictHostKeyChecking=no' \
--extra-vars "\$extra_vars"
"""
}
}
@ -73,8 +88,11 @@ pipeline {
always {
// Remove dynamic Inventory file
sh """
set +x
hash=\$(echo -n "${params.host_ip}" | md5sum | cut -c 1-8)
inventory_file="/var/jenkins_home/ansible/.inv/inventory-\$hash.yml"
set -x
rm \$inventory_file
"""