much tidying up
This commit is contained in:
@ -95,21 +95,26 @@ pipeline {
|
||||
// Generate the dynamic inventory file
|
||||
// Also create the kiosk variable yaml with hash value
|
||||
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/cosmos-kiosk.yaml"
|
||||
cd /var/jenkins_home/ansible
|
||||
chmod +x /var/jenkins_home/ansible/inventory/inventory.sh
|
||||
/var/jenkins_home/ansible/inventory/inventory.sh -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 -a \$jenkins_subnet_group -g \$jenkins_group -u \$jenkins_user -i ${params.host_ip}
|
||||
|
||||
|
||||
set +x
|
||||
hash=\$(echo -n "${params.host_ip}" | md5sum | cut -c 1-8)
|
||||
kiosk_yaml=/var/jenkins_home/ansible/roles/chrome_kiosk/files/kiosk-\$hash.yaml
|
||||
echo --- > \$kiosk_yaml
|
||||
echo kiosk_service_templates: >> \$kiosk_yaml
|
||||
echo '${params.kiosk_variable}' >> \$kiosk_yaml
|
||||
echo ... >> \$kiosk_yaml
|
||||
set -x
|
||||
ls -lah /var/jenkins_home/ansible/roles/chrome_kiosk/files/*.yaml
|
||||
cat \$kiosk_yaml
|
||||
|
||||
@ -123,25 +128,38 @@ pipeline {
|
||||
// /workspace/ansible/playbooks/cosmos-kiosk.yaml
|
||||
//
|
||||
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"
|
||||
kiosk_yaml=/var/jenkins_home/ansible/roles/chrome_kiosk/files/kiosk-\$hash.yaml
|
||||
playbook_file="/var/jenkins_home/ansible/playbooks/cosmos-kiosk.yaml"
|
||||
extra_vars=\$(echo " \
|
||||
docker_full=false \
|
||||
no_vpn=true \
|
||||
jenkins_kiosk=true \
|
||||
public_deploy=true \
|
||||
matt_public_key='${env.matt_public_key}' \
|
||||
cosmos_password='${env.cosmos_password}' \
|
||||
cosmos_root_password='${env.cosmos_root_password}' \
|
||||
new_hostname=${params.new_hostname} \
|
||||
force_x11=${params.force_x11} \
|
||||
rename_host=${params.rename_endpoint} \
|
||||
onboard_pi=${params.onboard_pi} \
|
||||
add_domain=${params.add_domain} \
|
||||
install_docker=${params.install_docker} \
|
||||
install_python=${params.install_python} \
|
||||
refresh_special=${params.refresh_special} \
|
||||
kiosk_yaml='\$kiosk_yaml' \
|
||||
" | tr -s " ")
|
||||
set -x
|
||||
|
||||
cd /var/jenkins_home/ansible
|
||||
|
||||
ansible-playbook -i \$inventory_file /var/jenkins_home/ansible/playbooks/cosmos-kiosk.yaml \
|
||||
ansible-playbook -i \$inventory_file \$playbook_file \
|
||||
--ssh-common-args='-o StrictHostKeyChecking=no' \
|
||||
--extra-vars "docker_full=false no_vpn=true jenkins_kiosk=true public_deploy=true \
|
||||
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}' \
|
||||
new_hostname=${params.new_hostname} force_x11=${params.force_x11} \
|
||||
rename_host=${params.rename_endpoint} onboard_pi=${params.onboard_pi} \
|
||||
add_domain=${params.add_domain} install_docker=${params.install_docker} \
|
||||
install_python=${params.install_python} refresh_special=${params.refresh_special} \
|
||||
kiosk_yaml='\$kiosk_yaml'"
|
||||
|
||||
--extra-vars "\$extra_vars"
|
||||
|
||||
"""
|
||||
}
|
||||
}
|
||||
@ -153,10 +171,12 @@ pipeline {
|
||||
// Remove kiosk_yaml 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"
|
||||
kiosk_yaml=/var/jenkins_home/ansible/roles/chrome_kiosk/files/kiosk-\$hash.yaml
|
||||
set -x
|
||||
rm \$inventory_file
|
||||
rm \$kiosk_yaml
|
||||
|
||||
|
||||
Reference in New Issue
Block a user