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

@ -25,6 +25,7 @@ pipeline {
cosmos_password = credentials('cosmos_password')
cosmos_root_password = credentials('cosmos_root_password')
vm_party_username_password = credentials('cosmos_root_password')
cosmostat_api_key = credentials("cosmostat_api_key")
is_admin = '0'
}
@ -39,13 +40,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})
cd /var/jenkins_home/ansible
playbook_file="/var/jenkins_home/ansible/playbooks/test.yaml"
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}
"""
}
@ -54,22 +59,35 @@ 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/test.yaml"
extra_vars=\$(echo " \
host_ip=${params.host_ip} \
saturn_behemoth=${SATURN_BEHEMOTH} \
linux_ldap_pwd=${LINUX_LDAP_PWD} \
pxe_proxy_password=${pxe_proxy_password} \
PXE_API_KEY=${PXE_API_KEY} \
AUTHORIZED_KEY=${AUTHORIZED_KEY} \
TERRA_BEHEMOTH_SMB=${TERRA_BEHEMOTH_SMB} \
CIFS_USERNAME=${env.TERRA_BEHEMOTH_SMB_USR} \
CIFS_PASSWORD=${env.TERRA_BEHEMOTH_SMB_PSW} \
MATT_PASSWORD=${env.MATT_PASSWORD} \
matt_public_key='${env.matt_public_key}' \
cosmos_password='${env.cosmos_password}' \
cosmos_root_password='${env.cosmos_root_password}' \
vm_party_username_password=${env.vm_party_username_password} \
REAL_API_KEY=${env.cosmostat_api_key} \
" | tr -s " ")
set -x
cd /var/jenkins_home/ansible
ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/test.yaml \
--ssh-common-args='-o StrictHostKeyChecking=no'\
--extra-vars "saturn_behemoth=${SATURN_BEHEMOTH} linux_ldap_pwd=${LINUX_LDAP_PWD} \
pxe_proxy_password=${pxe_proxy_password} PXE_API_KEY=${PXE_API_KEY} \
AUTHORIZED_KEY=${AUTHORIZED_KEY} TERRA_BEHEMOTH_SMB=${TERRA_BEHEMOTH_SMB} \
CIFS_USERNAME=${env.TERRA_BEHEMOTH_SMB_USR} CIFS_PASSWORD=${env.TERRA_BEHEMOTH_SMB_PSW} \
MATT_PASSWORD=${env.MATT_PASSWORD} host_ip=${params.host_ip} \
matt_public_key='${env.matt_public_key}' matt_private_key='${env.matt_private_key}' \
cosmos_password='${env.cosmos_password}' cosmos_root_password='${env.cosmos_root_password}' \
vm_party_username_password=${env.vm_party_username_password} }"
ansible-playbook -i \$inventory_file \$playbook_file \
--ssh-common-args='-o StrictHostKeyChecking=no' \
--extra-vars "\$extra_vars matt_private_key='${env.matt_private_key}'"
"""
}
}
@ -79,8 +97,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
"""